diff options
| author | Shadowghost <Ghost_of_Stone@web.de> | 2022-07-21 09:26:18 +0200 |
|---|---|---|
| committer | Shadowghost <Ghost_of_Stone@web.de> | 2022-07-21 09:26:18 +0200 |
| commit | f6e41269d94e4c3096b136a47d3616cb0c5fe316 (patch) | |
| tree | 294a1cf013d3c52422db6769dc80e1d39cc6bdf6 /Jellyfin.Networking/Manager/NetworkManager.cs | |
| parent | 05458a4a4240d2b15db93de6c9ec25376677b5e1 (diff) | |
Enforce interface bindings on SSDP, add Loopback to LAN if no LAN defined
Diffstat (limited to 'Jellyfin.Networking/Manager/NetworkManager.cs')
| -rw-r--r-- | Jellyfin.Networking/Manager/NetworkManager.cs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Jellyfin.Networking/Manager/NetworkManager.cs b/Jellyfin.Networking/Manager/NetworkManager.cs index af2429cc2..b1112626c 100644 --- a/Jellyfin.Networking/Manager/NetworkManager.cs +++ b/Jellyfin.Networking/Manager/NetworkManager.cs @@ -298,20 +298,22 @@ namespace Jellyfin.Networking.Manager if (_lanSubnets.Count == 0) { - // If no LAN addresses are specified, all private subnets are deemed to be the LAN + // If no LAN addresses are specified, all private subnets and Loopback are deemed to be the LAN _logger.LogDebug("Using LAN interface addresses as user provided no LAN details."); if (IsIpv6Enabled) { - _lanSubnets.Add(new IPNetwork(IPAddress.Parse("fc00::"), 7)); // ULA - _lanSubnets.Add(new IPNetwork(IPAddress.Parse("fe80::"), 10)); // Site local + _lanSubnets.Add(new IPNetwork(IPAddress.IPv6Loopback, 128)); // RFC 4291 (Loopback) + _lanSubnets.Add(new IPNetwork(IPAddress.Parse("fe80::"), 10)); // RFC 4291 (Site local) + _lanSubnets.Add(new IPNetwork(IPAddress.Parse("fc00::"), 7)); // RFC 4193 (Unique local) } if (IsIpv4Enabled) { - _lanSubnets.Add(new IPNetwork(IPAddress.Parse("10.0.0.0"), 8)); - _lanSubnets.Add(new IPNetwork(IPAddress.Parse("172.16.0.0"), 12)); - _lanSubnets.Add(new IPNetwork(IPAddress.Parse("192.168.0.0"), 16)); + _lanSubnets.Add(new IPNetwork(IPAddress.Loopback, 8)); // RFC 5735 (Loopback) + _lanSubnets.Add(new IPNetwork(IPAddress.Parse("10.0.0.0"), 8)); // RFC 1918 (private) + _lanSubnets.Add(new IPNetwork(IPAddress.Parse("172.16.0.0"), 12)); // RFC 1918 (private) + _lanSubnets.Add(new IPNetwork(IPAddress.Parse("192.168.0.0"), 16)); // RFC 1918 (private) } } @@ -371,11 +373,13 @@ namespace Jellyfin.Networking.Manager } } + // Remove all IPv4 interfaces if IPv4 is disabled if (!IsIpv4Enabled) { _interfaces.RemoveAll(x => x.AddressFamily == AddressFamily.InterNetwork); } + // Remove all IPv6 interfaces if IPv6 is disabled if (!IsIpv6Enabled) { _interfaces.RemoveAll(x => x.AddressFamily == AddressFamily.InterNetworkV6); |