From 2aaecb8e148aef6cda67797fa4227a8ebcf7e5bb Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Tue, 28 Apr 2020 21:45:46 +0100
Subject: Whilst fixing issues with SSDP on devices with multiple interfaces, i
 came across a design issue in the current code - namely interfaces without a
 gateway were ignored.

Fixing this required the removal of the code that attempted to detect virtual interfaces. Not wanting to remove functionality, but not able to keep the code in place, I implemented a work around solution (see 4 below).

Whilst in the area, I also fixed a few minor bugs i encountered (1, 5, 6 below) and stopped SSDP messages from going out on non-LAN interfaces (3)

All these changes are related.

Changes

1 IsInPrivateAddressSpace - improved subnet code checking
2 interfaces with no gateway were being excluded from SSDP blasts
3 filtered SSDP blasts from not LAN addresses as defined on the network page.
4 removed #986 mod - as this was part of the issue of #2986. Interfaces can be excluded from the LAN by putting the LAN address in brackets. eg. [10.1.1.1] will exclude an interface with ip address 10.1.1.1 from SSDP
5 fixed a problem where an invalid LAN address causing the SSDP to crash
6 corrected local link filter (FilterIPAddress) to filter on 169.254. addresses
---
 MediaBrowser.Common/Net/INetworkManager.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Common/Net')

diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 3ba75abd8..b7ec1d122 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -41,10 +41,12 @@ namespace MediaBrowser.Common.Net
         /// <returns><c>true</c> if [is in local network] [the specified endpoint]; otherwise, <c>false</c>.</returns>
         bool IsInLocalNetwork(string endpoint);
 
-        IPAddress[] GetLocalIpAddresses(bool ignoreVirtualInterface);
+        IPAddress[] GetLocalIpAddresses();
 
         bool IsAddressInSubnets(string addressString, string[] subnets);
 
+        bool IsAddressInSubnets(IPAddress address, bool excludeInterfaces, bool excludeRFC);
+
         bool IsInSameSubnet(IPAddress address1, IPAddress address2, IPAddress subnetMask);
 
         IPAddress GetLocalIpSubnetMask(IPAddress address);
-- 
cgit v1.2.3


From a3140f83c6461164658303d1bb7c1d992cfd9802 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Tue, 28 Apr 2020 21:51:49 +0100
Subject: Revert "Whilst fixing issues with SSDP on devices with multiple
 interfaces, i came across a design issue in the current code - namely
 interfaces without a gateway were ignored."

This reverts commit 2aaecb8e148aef6cda67797fa4227a8ebcf7e5bb.
---
 Emby.Dlna/Main/DlnaEntryPoint.cs                   |   6 -
 Emby.Server.Implementations/ApplicationHost.cs     |   2 +-
 .../Networking/NetworkManager.cs                   | 149 +++++++++------------
 MediaBrowser.Common/Net/INetworkManager.cs         |   4 +-
 RSSDP/SsdpCommunicationsServer.cs                  |   4 +-
 RSSDP/SsdpDeviceLocator.cs                         |   2 +-
 6 files changed, 70 insertions(+), 97 deletions(-)

(limited to 'MediaBrowser.Common/Net')

diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
index 721350483..c5d60b2a0 100644
--- a/Emby.Dlna/Main/DlnaEntryPoint.cs
+++ b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -266,12 +266,6 @@ namespace Emby.Dlna.Main
                     continue;
                 }
 
-                // Limit to LAN addresses only
-                if (!_networkManager.IsAddressInSubnets(address, true, true))
-                {
-                    continue;
-                }
-                
                 var fullService = "urn:schemas-upnp-org:device:MediaServer:1";
 
                 _logger.LogInformation("Registering publisher for {0} on {1}", fullService, address);
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 97fc2c004..33aec1a06 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1274,7 +1274,7 @@ namespace Emby.Server.Implementations
 
             if (addresses.Count == 0)
             {
-                addresses.AddRange(_networkManager.GetLocalIpAddresses());
+                addresses.AddRange(_networkManager.GetLocalIpAddresses(ServerConfigurationManager.Configuration.IgnoreVirtualInterfaces));
             }
 
             var resultList = new List<IPAddress>();
diff --git a/Emby.Server.Implementations/Networking/NetworkManager.cs b/Emby.Server.Implementations/Networking/NetworkManager.cs
index 465530888..b3e88b667 100644
--- a/Emby.Server.Implementations/Networking/NetworkManager.cs
+++ b/Emby.Server.Implementations/Networking/NetworkManager.cs
@@ -56,13 +56,13 @@ namespace Emby.Server.Implementations.Networking
             NetworkChanged?.Invoke(this, EventArgs.Empty);
         }
 
-        public IPAddress[] GetLocalIpAddresses()
+        public IPAddress[] GetLocalIpAddresses(bool ignoreVirtualInterface = true)
         {
             lock (_localIpAddressSyncLock)
             {
                 if (_localIpAddresses == null)
                 {
-                    var addresses = GetLocalIpAddressesInternal().ToArray();
+                    var addresses = GetLocalIpAddressesInternal(ignoreVirtualInterface).ToArray();
 
                     _localIpAddresses = addresses;
                 }
@@ -71,45 +71,42 @@ namespace Emby.Server.Implementations.Networking
             }
         }
 
-        private List<IPAddress> GetLocalIpAddressesInternal()
+        private List<IPAddress> GetLocalIpAddressesInternal(bool ignoreVirtualInterface)
         {
-            var list = GetIPsDefault().ToList();
+            var list = GetIPsDefault(ignoreVirtualInterface).ToList();
 
             if (list.Count == 0)
             {
                 list = GetLocalIpAddressesFallback().GetAwaiter().GetResult().ToList();
             }
 
-            var listClone = new List<IPAddress>();
+            var listClone = list.ToList();
 
-            var subnets = LocalSubnetsFn();
-
-            foreach (var i in list)
-            {
-                if (i.IsIPv6LinkLocal || i.ToString().StartsWith("169.254.", StringComparison.OrdinalIgnoreCase))
-                {
-                    continue;
-                }
-                if (Array.IndexOf(subnets, "[" + i.ToString() + "]") == -1)
-                {
-                    listClone.Add(i);
-                }
-            }
-
-            return listClone
+            return list
                 .OrderBy(i => i.AddressFamily == AddressFamily.InterNetwork ? 0 : 1)
-                // .ThenBy(i => listClone.IndexOf(i))
+                .ThenBy(i => listClone.IndexOf(i))
+                .Where(FilterIpAddress)
                 .GroupBy(i => i.ToString())
                 .Select(x => x.First())
                 .ToList();
         }
 
+        private static bool FilterIpAddress(IPAddress address)
+        {
+            if (address.IsIPv6LinkLocal
+                || address.ToString().StartsWith("169.", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         public bool IsInPrivateAddressSpace(string endpoint)
         {
             return IsInPrivateAddressSpace(endpoint, true);
         }
 
-        // checks if the address in endpoint is an RFC1918, RFC1122, or RFC3927 address
         private bool IsInPrivateAddressSpace(string endpoint, bool checkSubnets)
         {
             if (string.Equals(endpoint, "::1", StringComparison.OrdinalIgnoreCase))
@@ -131,28 +128,23 @@ namespace Emby.Server.Implementations.Networking
             }
 
             // Private address space:
+            // http://en.wikipedia.org/wiki/Private_network
 
-            if (endpoint.ToLower() == "localhost")
+            if (endpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase))
             {
-                return true;
+                return Is172AddressPrivate(endpoint);
             }
 
-            try
+            if (endpoint.StartsWith("localhost", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase))
             {
-                byte[] octet = IPAddress.Parse(endpoint).GetAddressBytes();
-
-                if ((octet[0] == 10) ||
-                    (octet[0] == 172 && (octet[1] >= 16 && octet[1] <= 31)) || // RFC1918
-                    (octet[0] == 192 && octet[1] == 168) || // RFC1918
-                    (octet[0] == 127) || // RFC1122
-                    (octet[0] == 169 && octet[1] == 254)) // RFC3927
-                {
-                    return false;
-                }
+                return true;
             }
-            catch
+
+            if (checkSubnets && endpoint.StartsWith("192.168", StringComparison.OrdinalIgnoreCase))
             {
-                // return false;
+                return true;
             }
 
             if (checkSubnets && IsInPrivateAddressSpaceAndLocalSubnet(endpoint))
@@ -185,7 +177,6 @@ namespace Emby.Server.Implementations.Networking
             return false;
         }
 
-        // Gives a list of possible subnets from the system whose interface ip starts with endpointFirstPart 
         private List<string> GetSubnets(string endpointFirstPart)
         {
             lock (_subnetLookupLock)
@@ -231,6 +222,19 @@ namespace Emby.Server.Implementations.Networking
             }
         }
 
+        private static bool Is172AddressPrivate(string endpoint)
+        {
+            for (var i = 16; i <= 31; i++)
+            {
+                if (endpoint.StartsWith("172." + i.ToString(CultureInfo.InvariantCulture) + ".", StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
         public bool IsInLocalNetwork(string endpoint)
         {
             return IsInLocalNetworkInternal(endpoint, true);
@@ -241,57 +245,23 @@ namespace Emby.Server.Implementations.Networking
             return IsAddressInSubnets(IPAddress.Parse(addressString), addressString, subnets);
         }
 
-        // returns true if address is in the LAN list in the config file
-        // always returns false if address has been excluded from the LAN if excludeInterfaces is true
-        // and excludes RFC addresses if excludeRFC is true
-        public bool IsAddressInSubnets(IPAddress address, bool excludeInterfaces, bool excludeRFC)
-        {
-            byte[] octet = address.GetAddressBytes();
-
-            if ((octet[0] == 127) || // RFC1122
-                (octet[0] == 169 && octet[1] == 254)) // RFC3927
-            {
-                // don't use on loopback or 169 interfaces
-                return false;
-            }
-
-            string addressString = address.ToString();
-            string excludeAddress = "[" + addressString + "]";
-            var subnets = LocalSubnetsFn();
-
-            // Exclude any addresses if they appear in the LAN list in [ ]
-            if (Array.IndexOf(subnets, excludeAddress) != -1)
-            {
-                return false;
-            }
-            return IsAddressInSubnets(address, addressString, subnets);
-        }       
-
-        // Checks to see if address/addressString (same but different type) falls within subnets[]
         private static bool IsAddressInSubnets(IPAddress address, string addressString, string[] subnets)
         {
             foreach (var subnet in subnets)
             {
                 var normalizedSubnet = subnet.Trim();
-                // is the subnet a host address and does it match the address being passes?
+
                 if (string.Equals(normalizedSubnet, addressString, StringComparison.OrdinalIgnoreCase))
                 {
                     return true;
                 }
-                // parse CIDR subnets and see if address falls within it.
+
                 if (normalizedSubnet.Contains('/', StringComparison.Ordinal))
                 {
-                    try
-                    {
-                        var ipNetwork = IPNetwork.Parse(normalizedSubnet);
-                        if (ipNetwork.Contains(address))
-                        {
-                            return true;
-                        }
-                    }
-                    catch
+                    var ipNetwork = IPNetwork.Parse(normalizedSubnet);
+                    if (ipNetwork.Contains(address))
                     {
-                        // Ignoring - invalid subnet passed encountered.
+                        return true;
                     }
                 }
             }
@@ -389,8 +359,8 @@ namespace Emby.Server.Implementations.Networking
         {
             return Dns.GetHostAddressesAsync(hostName);
         }
-        
-        private IEnumerable<IPAddress> GetIPsDefault()
+
+        private IEnumerable<IPAddress> GetIPsDefault(bool ignoreVirtualInterface)
         {
             IEnumerable<NetworkInterface> interfaces;
 
@@ -410,7 +380,15 @@ namespace Emby.Server.Implementations.Networking
             {
                 var ipProperties = network.GetIPProperties();
 
-                // Exclude any addresses if they appear in the LAN list in [ ]
+                // Try to exclude virtual adapters
+                // http://stackoverflow.com/questions/8089685/c-sharp-finding-my-machines-local-ip-address-and-not-the-vms
+                var addr = ipProperties.GatewayAddresses.FirstOrDefault();
+                if (addr == null
+                    || (ignoreVirtualInterface
+                        && (addr.Address.Equals(IPAddress.Any) || addr.Address.Equals(IPAddress.IPv6Any))))
+                {
+                    return Enumerable.Empty<IPAddress>();
+                }
 
                 return ipProperties.UnicastAddresses
                     .Select(i => i.Address)
@@ -516,12 +494,15 @@ namespace Emby.Server.Implementations.Networking
 
             foreach (NetworkInterface ni in interfaces)
             {
-                foreach (UnicastIPAddressInformation ip in ni.GetIPProperties().UnicastAddresses)
+                if (ni.GetIPProperties().GatewayAddresses.FirstOrDefault() != null)
                 {
-                    if (ip.Address.Equals(address) && ip.IPv4Mask != null)
+                    foreach (UnicastIPAddressInformation ip in ni.GetIPProperties().UnicastAddresses)
                     {
-                        return ip.IPv4Mask;
-                    }                    
+                        if (ip.Address.Equals(address) && ip.IPv4Mask != null)
+                        {
+                            return ip.IPv4Mask;
+                        }
+                    }
                 }
             }
 
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index b7ec1d122..3ba75abd8 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -41,12 +41,10 @@ namespace MediaBrowser.Common.Net
         /// <returns><c>true</c> if [is in local network] [the specified endpoint]; otherwise, <c>false</c>.</returns>
         bool IsInLocalNetwork(string endpoint);
 
-        IPAddress[] GetLocalIpAddresses();
+        IPAddress[] GetLocalIpAddresses(bool ignoreVirtualInterface);
 
         bool IsAddressInSubnets(string addressString, string[] subnets);
 
-        bool IsAddressInSubnets(IPAddress address, bool excludeInterfaces, bool excludeRFC);
-
         bool IsInSameSubnet(IPAddress address1, IPAddress address2, IPAddress subnetMask);
 
         IPAddress GetLocalIpSubnetMask(IPAddress address);
diff --git a/RSSDP/SsdpCommunicationsServer.cs b/RSSDP/SsdpCommunicationsServer.cs
index 47da52005..18097ef24 100644
--- a/RSSDP/SsdpCommunicationsServer.cs
+++ b/RSSDP/SsdpCommunicationsServer.cs
@@ -370,13 +370,13 @@ namespace Rssdp.Infrastructure
 
             if (_enableMultiSocketBinding)
             {
-                foreach (var address in _networkManager.GetLocalIpAddresses())
+                foreach (var address in _networkManager.GetLocalIpAddresses(_config.Configuration.IgnoreVirtualInterfaces))
                 {
                     if (address.AddressFamily == AddressFamily.InterNetworkV6)
                     {
                         // Not support IPv6 right now
                         continue;
-                    }                  
+                    }
 
                     try
                     {
diff --git a/RSSDP/SsdpDeviceLocator.cs b/RSSDP/SsdpDeviceLocator.cs
index b62c50e28..59a2710d5 100644
--- a/RSSDP/SsdpDeviceLocator.cs
+++ b/RSSDP/SsdpDeviceLocator.cs
@@ -357,7 +357,7 @@ namespace Rssdp.Infrastructure
         private void ProcessSearchResponseMessage(HttpResponseMessage message, IPAddress localIpAddress)
         {
             if (!message.IsSuccessStatusCode) return;
-            
+
             var location = GetFirstHeaderUriValue("Location", message);
             if (location != null)
             {
-- 
cgit v1.2.3


From ebd589aa86abb7bdbc9ab981cb8f4c908f790ac1 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Tue, 28 Apr 2020 21:57:39 +0100
Subject: Whilst fixing issues with SSDP on devices with multiple interfaces, i
 came across a design issue in the current code - namely interfaces without a
 gateway were ignored.

Fixing this required the removal of the code that attempted to detect virtual interfaces. Not wanting to remove functionality, but not able to keep the code in place, I implemented a work around solution (see 4 below).

Whilst in the area, I also fixed a few minor bugs i encountered (1, 5, 6 below) and stopped SSDP messages from going out on non-LAN interfaces (3)

All these changes are related.

Changes

1 IsInPrivateAddressSpace - improved subnet code checking
2 interfaces with no gateway were being excluded from SSDP blasts
3 filtered SSDP blasts from not LAN addresses as defined on the network page.
4 removed #986 mod - as this was part of the issue of #2986. Interfaces can be excluded from the LAN by putting the LAN address in brackets. eg. [10.1.1.1] will exclude an interface with ip address 10.1.1.1 from SSDP
5 fixed a problem where an invalid LAN address causing the SSDP to crash
6 corrected local link filter (FilterIPAddress) to filter on 169.254. addresses
---
 Emby.Dlna/Main/DlnaEntryPoint.cs                   |   8 +-
 Emby.Server.Implementations/ApplicationHost.cs     |   2 +-
 .../Networking/NetworkManager.cs                   | 150 ++++++++++++---------
 MediaBrowser.Common/Net/INetworkManager.cs         |   4 +-
 RSSDP/SsdpCommunicationsServer.cs                  |  11 +-
 RSSDP/SsdpDeviceLocator.cs                         |   2 +-
 6 files changed, 101 insertions(+), 76 deletions(-)

(limited to 'MediaBrowser.Common/Net')

diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
index c5d60b2a0..e6806c87b 100644
--- a/Emby.Dlna/Main/DlnaEntryPoint.cs
+++ b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -180,7 +180,7 @@ namespace Emby.Dlna.Main
                     var enableMultiSocketBinding = OperatingSystem.Id == OperatingSystemId.Windows ||
                                                    OperatingSystem.Id == OperatingSystemId.Linux;
 
-                    _communicationsServer = new SsdpCommunicationsServer(_config, _socketFactory, _networkManager, _logger, enableMultiSocketBinding)
+                    _communicationsServer = new SsdpCommunicationsServer(_socketFactory, _networkManager, _logger, enableMultiSocketBinding)
                     {
                         IsShared = true
                     };
@@ -266,6 +266,12 @@ namespace Emby.Dlna.Main
                     continue;
                 }
 
+                // Limit to LAN addresses only
+                if (!_networkManager.IsAddressInSubnets(address, true, true))
+                {
+                    continue;
+                }
+                
                 var fullService = "urn:schemas-upnp-org:device:MediaServer:1";
 
                 _logger.LogInformation("Registering publisher for {0} on {1}", fullService, address);
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 33aec1a06..97fc2c004 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1274,7 +1274,7 @@ namespace Emby.Server.Implementations
 
             if (addresses.Count == 0)
             {
-                addresses.AddRange(_networkManager.GetLocalIpAddresses(ServerConfigurationManager.Configuration.IgnoreVirtualInterfaces));
+                addresses.AddRange(_networkManager.GetLocalIpAddresses());
             }
 
             var resultList = new List<IPAddress>();
diff --git a/Emby.Server.Implementations/Networking/NetworkManager.cs b/Emby.Server.Implementations/Networking/NetworkManager.cs
index b3e88b667..5979d1eae 100644
--- a/Emby.Server.Implementations/Networking/NetworkManager.cs
+++ b/Emby.Server.Implementations/Networking/NetworkManager.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
@@ -56,13 +55,13 @@ namespace Emby.Server.Implementations.Networking
             NetworkChanged?.Invoke(this, EventArgs.Empty);
         }
 
-        public IPAddress[] GetLocalIpAddresses(bool ignoreVirtualInterface = true)
+        public IPAddress[] GetLocalIpAddresses()
         {
             lock (_localIpAddressSyncLock)
             {
                 if (_localIpAddresses == null)
                 {
-                    var addresses = GetLocalIpAddressesInternal(ignoreVirtualInterface).ToArray();
+                    var addresses = GetLocalIpAddressesInternal().ToArray();
 
                     _localIpAddresses = addresses;
                 }
@@ -71,35 +70,37 @@ namespace Emby.Server.Implementations.Networking
             }
         }
 
-        private List<IPAddress> GetLocalIpAddressesInternal(bool ignoreVirtualInterface)
+        private List<IPAddress> GetLocalIpAddressesInternal()
         {
-            var list = GetIPsDefault(ignoreVirtualInterface).ToList();
+            var list = GetIPsDefault().ToList();
 
             if (list.Count == 0)
             {
                 list = GetLocalIpAddressesFallback().GetAwaiter().GetResult().ToList();
             }
 
-            var listClone = list.ToList();
+            var listClone = new List<IPAddress>();
 
-            return list
-                .OrderBy(i => i.AddressFamily == AddressFamily.InterNetwork ? 0 : 1)
-                .ThenBy(i => listClone.IndexOf(i))
-                .Where(FilterIpAddress)
-                .GroupBy(i => i.ToString())
-                .Select(x => x.First())
-                .ToList();
-        }
+            var subnets = LocalSubnetsFn();
 
-        private static bool FilterIpAddress(IPAddress address)
-        {
-            if (address.IsIPv6LinkLocal
-                || address.ToString().StartsWith("169.", StringComparison.OrdinalIgnoreCase))
+            foreach (var i in list)
             {
-                return false;
+                if (i.IsIPv6LinkLocal || i.ToString().StartsWith("169.254.", StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+                if (Array.IndexOf(subnets, "[" + i.ToString() + "]") == -1)
+                {
+                    listClone.Add(i);
+                }
             }
 
-            return true;
+            return listClone
+                .OrderBy(i => i.AddressFamily == AddressFamily.InterNetwork ? 0 : 1)
+                // .ThenBy(i => listClone.IndexOf(i))
+                .GroupBy(i => i.ToString())
+                .Select(x => x.First())
+                .ToList();
         }
 
         public bool IsInPrivateAddressSpace(string endpoint)
@@ -107,6 +108,7 @@ namespace Emby.Server.Implementations.Networking
             return IsInPrivateAddressSpace(endpoint, true);
         }
 
+        // checks if the address in endpoint is an RFC1918, RFC1122, or RFC3927 address
         private bool IsInPrivateAddressSpace(string endpoint, bool checkSubnets)
         {
             if (string.Equals(endpoint, "::1", StringComparison.OrdinalIgnoreCase))
@@ -128,23 +130,28 @@ namespace Emby.Server.Implementations.Networking
             }
 
             // Private address space:
-            // http://en.wikipedia.org/wiki/Private_network
 
-            if (endpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase))
+            if (endpoint.ToLower() == "localhost")
             {
-                return Is172AddressPrivate(endpoint);
+                return true;
             }
 
-            if (endpoint.StartsWith("localhost", StringComparison.OrdinalIgnoreCase) ||
-                endpoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
-                endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase))
+            try
             {
-                return true;
-            }
+                byte[] octet = IPAddress.Parse(endpoint).GetAddressBytes();
 
-            if (checkSubnets && endpoint.StartsWith("192.168", StringComparison.OrdinalIgnoreCase))
+                if ((octet[0] == 10) ||
+                    (octet[0] == 172 && (octet[1] >= 16 && octet[1] <= 31)) || // RFC1918
+                    (octet[0] == 192 && octet[1] == 168) || // RFC1918
+                    (octet[0] == 127) || // RFC1122
+                    (octet[0] == 169 && octet[1] == 254)) // RFC3927
+                {
+                    return false;
+                }
+            }
+            catch
             {
-                return true;
+             
             }
 
             if (checkSubnets && IsInPrivateAddressSpaceAndLocalSubnet(endpoint))
@@ -177,6 +184,7 @@ namespace Emby.Server.Implementations.Networking
             return false;
         }
 
+        // Gives a list of possible subnets from the system whose interface ip starts with endpointFirstPart 
         private List<string> GetSubnets(string endpointFirstPart)
         {
             lock (_subnetLookupLock)
@@ -222,19 +230,6 @@ namespace Emby.Server.Implementations.Networking
             }
         }
 
-        private static bool Is172AddressPrivate(string endpoint)
-        {
-            for (var i = 16; i <= 31; i++)
-            {
-                if (endpoint.StartsWith("172." + i.ToString(CultureInfo.InvariantCulture) + ".", StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
         public bool IsInLocalNetwork(string endpoint)
         {
             return IsInLocalNetworkInternal(endpoint, true);
@@ -245,23 +240,57 @@ namespace Emby.Server.Implementations.Networking
             return IsAddressInSubnets(IPAddress.Parse(addressString), addressString, subnets);
         }
 
+        // returns true if address is in the LAN list in the config file
+        // always returns false if address has been excluded from the LAN if excludeInterfaces is true
+        // and excludes RFC addresses if excludeRFC is true
+        public bool IsAddressInSubnets(IPAddress address, bool excludeInterfaces, bool excludeRFC)
+        {
+            byte[] octet = address.GetAddressBytes();
+
+            if ((octet[0] == 127) || // RFC1122
+                (octet[0] == 169 && octet[1] == 254)) // RFC3927
+            {
+                // don't use on loopback or 169 interfaces
+                return false;
+            }
+
+            string addressString = address.ToString();
+            string excludeAddress = "[" + addressString + "]";
+            var subnets = LocalSubnetsFn();
+
+            // Exclude any addresses if they appear in the LAN list in [ ]
+            if (Array.IndexOf(subnets, excludeAddress) != -1)
+            {
+                return false;
+            }
+            return IsAddressInSubnets(address, addressString, subnets);
+        }       
+
+        // Checks to see if address/addressString (same but different type) falls within subnets[]
         private static bool IsAddressInSubnets(IPAddress address, string addressString, string[] subnets)
         {
             foreach (var subnet in subnets)
             {
                 var normalizedSubnet = subnet.Trim();
-
+                // is the subnet a host address and does it match the address being passes?
                 if (string.Equals(normalizedSubnet, addressString, StringComparison.OrdinalIgnoreCase))
                 {
                     return true;
                 }
-
+                // parse CIDR subnets and see if address falls within it.
                 if (normalizedSubnet.Contains('/', StringComparison.Ordinal))
                 {
-                    var ipNetwork = IPNetwork.Parse(normalizedSubnet);
-                    if (ipNetwork.Contains(address))
+                    try
                     {
-                        return true;
+                        var ipNetwork = IPNetwork.Parse(normalizedSubnet);
+                        if (ipNetwork.Contains(address))
+                        {
+                            return true;
+                        }
+                    }
+                    catch
+                    {
+                        // Ignoring - invalid subnet passed encountered.
                     }
                 }
             }
@@ -359,8 +388,8 @@ namespace Emby.Server.Implementations.Networking
         {
             return Dns.GetHostAddressesAsync(hostName);
         }
-
-        private IEnumerable<IPAddress> GetIPsDefault(bool ignoreVirtualInterface)
+        
+        private IEnumerable<IPAddress> GetIPsDefault()
         {
             IEnumerable<NetworkInterface> interfaces;
 
@@ -380,15 +409,7 @@ namespace Emby.Server.Implementations.Networking
             {
                 var ipProperties = network.GetIPProperties();
 
-                // Try to exclude virtual adapters
-                // http://stackoverflow.com/questions/8089685/c-sharp-finding-my-machines-local-ip-address-and-not-the-vms
-                var addr = ipProperties.GatewayAddresses.FirstOrDefault();
-                if (addr == null
-                    || (ignoreVirtualInterface
-                        && (addr.Address.Equals(IPAddress.Any) || addr.Address.Equals(IPAddress.IPv6Any))))
-                {
-                    return Enumerable.Empty<IPAddress>();
-                }
+                // Exclude any addresses if they appear in the LAN list in [ ]
 
                 return ipProperties.UnicastAddresses
                     .Select(i => i.Address)
@@ -494,15 +515,12 @@ namespace Emby.Server.Implementations.Networking
 
             foreach (NetworkInterface ni in interfaces)
             {
-                if (ni.GetIPProperties().GatewayAddresses.FirstOrDefault() != null)
+                foreach (UnicastIPAddressInformation ip in ni.GetIPProperties().UnicastAddresses)
                 {
-                    foreach (UnicastIPAddressInformation ip in ni.GetIPProperties().UnicastAddresses)
+                    if (ip.Address.Equals(address) && ip.IPv4Mask != null)
                     {
-                        if (ip.Address.Equals(address) && ip.IPv4Mask != null)
-                        {
-                            return ip.IPv4Mask;
-                        }
-                    }
+                        return ip.IPv4Mask;
+                    }                    
                 }
             }
 
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 3ba75abd8..b7ec1d122 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -41,10 +41,12 @@ namespace MediaBrowser.Common.Net
         /// <returns><c>true</c> if [is in local network] [the specified endpoint]; otherwise, <c>false</c>.</returns>
         bool IsInLocalNetwork(string endpoint);
 
-        IPAddress[] GetLocalIpAddresses(bool ignoreVirtualInterface);
+        IPAddress[] GetLocalIpAddresses();
 
         bool IsAddressInSubnets(string addressString, string[] subnets);
 
+        bool IsAddressInSubnets(IPAddress address, bool excludeInterfaces, bool excludeRFC);
+
         bool IsInSameSubnet(IPAddress address1, IPAddress address2, IPAddress subnetMask);
 
         IPAddress GetLocalIpSubnetMask(IPAddress address);
diff --git a/RSSDP/SsdpCommunicationsServer.cs b/RSSDP/SsdpCommunicationsServer.cs
index 18097ef24..a16e4c73f 100644
--- a/RSSDP/SsdpCommunicationsServer.cs
+++ b/RSSDP/SsdpCommunicationsServer.cs
@@ -46,8 +46,7 @@ namespace Rssdp.Infrastructure
         private HttpResponseParser _ResponseParser;
         private readonly ILogger _logger;
         private ISocketFactory _SocketFactory;
-        private readonly INetworkManager _networkManager;
-        private readonly IServerConfigurationManager _config;
+        private readonly INetworkManager _networkManager;        
 
         private int _LocalPort;
         private int _MulticastTtl;
@@ -77,11 +76,11 @@ namespace Rssdp.Infrastructure
         /// Minimum constructor.
         /// </summary>
         /// <exception cref="ArgumentNullException">The <paramref name="socketFactory"/> argument is null.</exception>
-        public SsdpCommunicationsServer(IServerConfigurationManager config, ISocketFactory socketFactory,
+        public SsdpCommunicationsServer(ISocketFactory socketFactory,
             INetworkManager networkManager, ILogger logger, bool enableMultiSocketBinding)
             : this(socketFactory, 0, SsdpConstants.SsdpDefaultMulticastTimeToLive, networkManager, logger, enableMultiSocketBinding)
         {
-            _config = config;
+            
         }
 
         /// <summary>
@@ -370,13 +369,13 @@ namespace Rssdp.Infrastructure
 
             if (_enableMultiSocketBinding)
             {
-                foreach (var address in _networkManager.GetLocalIpAddresses(_config.Configuration.IgnoreVirtualInterfaces))
+                foreach (var address in _networkManager.GetLocalIpAddresses())
                 {
                     if (address.AddressFamily == AddressFamily.InterNetworkV6)
                     {
                         // Not support IPv6 right now
                         continue;
-                    }
+                    }                  
 
                     try
                     {
diff --git a/RSSDP/SsdpDeviceLocator.cs b/RSSDP/SsdpDeviceLocator.cs
index 59a2710d5..b62c50e28 100644
--- a/RSSDP/SsdpDeviceLocator.cs
+++ b/RSSDP/SsdpDeviceLocator.cs
@@ -357,7 +357,7 @@ namespace Rssdp.Infrastructure
         private void ProcessSearchResponseMessage(HttpResponseMessage message, IPAddress localIpAddress)
         {
             if (!message.IsSuccessStatusCode) return;
-
+            
             var location = GetFirstHeaderUriValue("Location", message);
             if (location != null)
             {
-- 
cgit v1.2.3


From 61e65d032ecb1d2bf614e018f4a0dd925300cfde Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 17 May 2020 20:43:54 +0100
Subject: Update MediaBrowser.Common/Net/INetworkManager.cs

Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
---
 MediaBrowser.Common/Net/INetworkManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Common/Net')

diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 19314ada8..783b7c60c 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -62,7 +62,7 @@ namespace MediaBrowser.Common.Net
         IPAddress[] GetLocalIpAddresses();
        
         /// <summary>
-        /// Checks if the give address false within the ranges givin in [subnets]. The addresses in subnets can be hosts or subnets in the CIDR format.
+        /// Checks if the given address falls within the ranges given in [subnets]. The addresses in subnets can be hosts or subnets in the CIDR format.
         /// </summary>
         /// <param name="addressString">The address to check</param>
         /// <param name="subnets">If true, check against addresses in the LAN settings which have [] arroud and return true if it matches the address give in address</param>
-- 
cgit v1.2.3


From 5e1be0d4f0ac6ec4aa5f30ab617b544a38420c1a Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 17 May 2020 20:44:19 +0100
Subject: Update MediaBrowser.Common/Net/INetworkManager.cs

Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
---
 MediaBrowser.Common/Net/INetworkManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Common/Net')

diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 783b7c60c..1fec0390d 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -65,7 +65,7 @@ namespace MediaBrowser.Common.Net
         /// Checks if the given address falls within the ranges given in [subnets]. The addresses in subnets can be hosts or subnets in the CIDR format.
         /// </summary>
         /// <param name="addressString">The address to check</param>
-        /// <param name="subnets">If true, check against addresses in the LAN settings which have [] arroud and return true if it matches the address give in address</param>
+        /// <param name="subnets">If true, check against addresses in the LAN settings surrounded by brackets ([])</param>
         /// <returns><c>false</c>if the address isn't in the subnets, <c>true</c> otherwise</returns>
         bool IsAddressInSubnets(string addressString, string[] subnets);
 
-- 
cgit v1.2.3


From d5a924772b0b25808beb3405a041a037bbc679c8 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Sun, 17 May 2020 20:44:35 +0100
Subject: Update MediaBrowser.Common/Net/INetworkManager.cs

Co-authored-by: Patrick Barron <18354464+barronpm@users.noreply.github.com>
---
 MediaBrowser.Common/Net/INetworkManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Common/Net')

diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 1fec0390d..56b253b2d 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Common.Net
         /// </summary>
         /// <param name="addressString">The address to check</param>
         /// <param name="subnets">If true, check against addresses in the LAN settings surrounded by brackets ([])</param>
-        /// <returns><c>false</c>if the address isn't in the subnets, <c>true</c> otherwise</returns>
+        /// <returns><c>true</c>if the address is in at least one of the given subnets, <c>false</c> otherwise.</returns>
         bool IsAddressInSubnets(string addressString, string[] subnets);
 
         /// <summary>
-- 
cgit v1.2.3


From f404e915eeef6cc9b05c6d006569b6d3a3e54eee Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Wed, 3 Jun 2020 13:04:45 +0200
Subject: Enable StyleCop for MediaBrowser.Common

---
 .../Configuration/ConfigurationStore.cs            | 20 +++++++++++++++
 .../Configuration/IApplicationPaths.cs             | 22 ++++++++--------
 .../Configuration/IConfigurationFactory.cs         | 30 ----------------------
 .../Configuration/IConfigurationManager.cs         |  2 +-
 .../Configuration/IValidatingConfiguration.cs      | 15 +++++++++++
 MediaBrowser.Common/MediaBrowser.Common.csproj     |  2 +-
 MediaBrowser.Common/Net/CacheMode.cs               | 11 ++++++++
 MediaBrowser.Common/Net/CompressionMethods.cs      | 15 +++++++++++
 MediaBrowser.Common/Net/HttpRequestOptions.cs      | 14 ----------
 MediaBrowser.Common/Progress/ActionableProgress.cs | 17 +++---------
 MediaBrowser.Common/Progress/SimpleProgress.cs     | 16 ++++++++++++
 11 files changed, 94 insertions(+), 70 deletions(-)
 create mode 100644 MediaBrowser.Common/Configuration/ConfigurationStore.cs
 create mode 100644 MediaBrowser.Common/Configuration/IValidatingConfiguration.cs
 create mode 100644 MediaBrowser.Common/Net/CacheMode.cs
 create mode 100644 MediaBrowser.Common/Net/CompressionMethods.cs
 create mode 100644 MediaBrowser.Common/Progress/SimpleProgress.cs

(limited to 'MediaBrowser.Common/Net')

diff --git a/MediaBrowser.Common/Configuration/ConfigurationStore.cs b/MediaBrowser.Common/Configuration/ConfigurationStore.cs
new file mode 100644
index 000000000..d31d45e4c
--- /dev/null
+++ b/MediaBrowser.Common/Configuration/ConfigurationStore.cs
@@ -0,0 +1,20 @@
+using System;
+
+namespace MediaBrowser.Common.Configuration
+{
+    /// <summary>
+    /// Describes a single entry in the application configuration.
+    /// </summary>
+    public class ConfigurationStore
+    {
+        /// <summary>
+        /// Gets or sets the unique identifier for the configuration.
+        /// </summary>
+        public string Key { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type used to store the data for this configuration entry.
+        /// </summary>
+        public Type ConfigurationType { get; set; }
+    }
+}
diff --git a/MediaBrowser.Common/Configuration/IApplicationPaths.cs b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
index 870b90796..4cea61682 100644
--- a/MediaBrowser.Common/Configuration/IApplicationPaths.cs
+++ b/MediaBrowser.Common/Configuration/IApplicationPaths.cs
@@ -3,12 +3,12 @@ using MediaBrowser.Model.Configuration;
 namespace MediaBrowser.Common.Configuration
 {
     /// <summary>
-    /// Interface IApplicationPaths
+    /// Interface IApplicationPaths.
     /// </summary>
     public interface IApplicationPaths
     {
         /// <summary>
-        /// Gets the path to the program data folder
+        /// Gets the path to the program data folder.
         /// </summary>
         /// <value>The program data path.</value>
         string ProgramDataPath { get; }
@@ -23,13 +23,13 @@ namespace MediaBrowser.Common.Configuration
         string WebPath { get; }
 
         /// <summary>
-        /// Gets the path to the program system folder
+        /// Gets the path to the program system folder.
         /// </summary>
         /// <value>The program data path.</value>
         string ProgramSystemPath { get; }
 
         /// <summary>
-        /// Gets the folder path to the data directory
+        /// Gets the folder path to the data directory.
         /// </summary>
         /// <value>The data directory.</value>
         string DataPath { get; }
@@ -41,43 +41,43 @@ namespace MediaBrowser.Common.Configuration
         string ImageCachePath { get; }
 
         /// <summary>
-        /// Gets the path to the plugin directory
+        /// Gets the path to the plugin directory.
         /// </summary>
         /// <value>The plugins path.</value>
         string PluginsPath { get; }
 
         /// <summary>
-        /// Gets the path to the plugin configurations directory
+        /// Gets the path to the plugin configurations directory.
         /// </summary>
         /// <value>The plugin configurations path.</value>
         string PluginConfigurationsPath { get; }
 
         /// <summary>
-        /// Gets the path to the log directory
+        /// Gets the path to the log directory.
         /// </summary>
         /// <value>The log directory path.</value>
         string LogDirectoryPath { get; }
 
         /// <summary>
-        /// Gets the path to the application configuration root directory
+        /// Gets the path to the application configuration root directory.
         /// </summary>
         /// <value>The configuration directory path.</value>
         string ConfigurationDirectoryPath { get; }
 
         /// <summary>
-        /// Gets the path to the system configuration file
+        /// Gets the path to the system configuration file.
         /// </summary>
         /// <value>The system configuration file path.</value>
         string SystemConfigurationFilePath { get; }
 
         /// <summary>
-        /// Gets the folder path to the cache directory
+        /// Gets the folder path to the cache directory.
         /// </summary>
         /// <value>The cache directory.</value>
         string CachePath { get; }
 
         /// <summary>
-        /// Gets the folder path to the temp directory within the cache folder
+        /// Gets the folder path to the temp directory within the cache folder.
         /// </summary>
         /// <value>The temp directory.</value>
         string TempDirectory { get; }
diff --git a/MediaBrowser.Common/Configuration/IConfigurationFactory.cs b/MediaBrowser.Common/Configuration/IConfigurationFactory.cs
index 07ca2b58b..6db1f1364 100644
--- a/MediaBrowser.Common/Configuration/IConfigurationFactory.cs
+++ b/MediaBrowser.Common/Configuration/IConfigurationFactory.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Common.Configuration
@@ -15,33 +14,4 @@ namespace MediaBrowser.Common.Configuration
         /// <returns>The configuration store.</returns>
         IEnumerable<ConfigurationStore> GetConfigurations();
     }
-
-    /// <summary>
-    /// Describes a single entry in the application configuration.
-    /// </summary>
-    public class ConfigurationStore
-    {
-        /// <summary>
-        /// Gets or sets the unique identifier for the configuration.
-        /// </summary>
-        public string Key { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type used to store the data for this configuration entry.
-        /// </summary>
-        public Type ConfigurationType { get; set; }
-    }
-
-    /// <summary>
-    /// A configuration store that can be validated.
-    /// </summary>
-    public interface IValidatingConfiguration
-    {
-        /// <summary>
-        /// Validation method to be invoked before saving the configuration.
-        /// </summary>
-        /// <param name="oldConfig">The old configuration.</param>
-        /// <param name="newConfig">The new configuration.</param>
-        void Validate(object oldConfig, object newConfig);
-    }
 }
diff --git a/MediaBrowser.Common/Configuration/IConfigurationManager.cs b/MediaBrowser.Common/Configuration/IConfigurationManager.cs
index caf2edd83..fe726090d 100644
--- a/MediaBrowser.Common/Configuration/IConfigurationManager.cs
+++ b/MediaBrowser.Common/Configuration/IConfigurationManager.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Common.Configuration
         event EventHandler<ConfigurationUpdateEventArgs> NamedConfigurationUpdated;
 
         /// <summary>
-        /// Gets or sets the application paths.
+        /// Gets the application paths.
         /// </summary>
         /// <value>The application paths.</value>
         IApplicationPaths CommonApplicationPaths { get; }
diff --git a/MediaBrowser.Common/Configuration/IValidatingConfiguration.cs b/MediaBrowser.Common/Configuration/IValidatingConfiguration.cs
new file mode 100644
index 000000000..3b1d84f3c
--- /dev/null
+++ b/MediaBrowser.Common/Configuration/IValidatingConfiguration.cs
@@ -0,0 +1,15 @@
+namespace MediaBrowser.Common.Configuration
+{
+    /// <summary>
+    /// A configuration store that can be validated.
+    /// </summary>
+    public interface IValidatingConfiguration
+    {
+        /// <summary>
+        /// Validation method to be invoked before saving the configuration.
+        /// </summary>
+        /// <param name="oldConfig">The old configuration.</param>
+        /// <param name="newConfig">The new configuration.</param>
+        void Validate(object oldConfig, object newConfig);
+    }
+}
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index a597b9052..0713b83b7 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -37,7 +37,7 @@
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
     <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
-    <!-- <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" /> -->
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
     <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
   </ItemGroup>
 
diff --git a/MediaBrowser.Common/Net/CacheMode.cs b/MediaBrowser.Common/Net/CacheMode.cs
new file mode 100644
index 000000000..78fa3bf9b
--- /dev/null
+++ b/MediaBrowser.Common/Net/CacheMode.cs
@@ -0,0 +1,11 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1602
+
+namespace MediaBrowser.Common.Net
+{
+    public enum CacheMode
+    {
+        None = 0,
+        Unconditional = 1
+    }
+}
diff --git a/MediaBrowser.Common/Net/CompressionMethods.cs b/MediaBrowser.Common/Net/CompressionMethods.cs
new file mode 100644
index 000000000..39b72609f
--- /dev/null
+++ b/MediaBrowser.Common/Net/CompressionMethods.cs
@@ -0,0 +1,15 @@
+#pragma warning disable CS1591
+#pragma warning disable SA1602
+
+using System;
+
+namespace MediaBrowser.Common.Net
+{
+    [Flags]
+    public enum CompressionMethods
+    {
+        None = 0b00000001,
+        Deflate = 0b00000010,
+        Gzip = 0b00000100
+    }
+}
diff --git a/MediaBrowser.Common/Net/HttpRequestOptions.cs b/MediaBrowser.Common/Net/HttpRequestOptions.cs
index 38274a80e..347fc9833 100644
--- a/MediaBrowser.Common/Net/HttpRequestOptions.cs
+++ b/MediaBrowser.Common/Net/HttpRequestOptions.cs
@@ -102,18 +102,4 @@ namespace MediaBrowser.Common.Net
             return value;
         }
     }
-
-    public enum CacheMode
-    {
-        None = 0,
-        Unconditional = 1
-    }
-
-    [Flags]
-    public enum CompressionMethods
-    {
-        None = 0b00000001,
-        Deflate = 0b00000010,
-        Gzip = 0b00000100
-    }
 }
diff --git a/MediaBrowser.Common/Progress/ActionableProgress.cs b/MediaBrowser.Common/Progress/ActionableProgress.cs
index af69055aa..d5bcd5be9 100644
--- a/MediaBrowser.Common/Progress/ActionableProgress.cs
+++ b/MediaBrowser.Common/Progress/ActionableProgress.cs
@@ -5,15 +5,16 @@ using System;
 namespace MediaBrowser.Common.Progress
 {
     /// <summary>
-    /// Class ActionableProgress
+    /// Class ActionableProgress.
     /// </summary>
-    /// <typeparam name="T"></typeparam>
+    /// <typeparam name="T">The type for the action parameter.</typeparam>
     public class ActionableProgress<T> : IProgress<T>
     {
         /// <summary>
-        /// The _actions
+        /// The _actions.
         /// </summary>
         private Action<T> _action;
+
         public event EventHandler<T> ProgressChanged;
 
         /// <summary>
@@ -32,14 +33,4 @@ namespace MediaBrowser.Common.Progress
             _action?.Invoke(value);
         }
     }
-
-    public class SimpleProgress<T> : IProgress<T>
-    {
-        public event EventHandler<T> ProgressChanged;
-
-        public void Report(T value)
-        {
-            ProgressChanged?.Invoke(this, value);
-        }
-    }
 }
diff --git a/MediaBrowser.Common/Progress/SimpleProgress.cs b/MediaBrowser.Common/Progress/SimpleProgress.cs
new file mode 100644
index 000000000..d75675bf1
--- /dev/null
+++ b/MediaBrowser.Common/Progress/SimpleProgress.cs
@@ -0,0 +1,16 @@
+#pragma warning disable CS1591
+
+using System;
+
+namespace MediaBrowser.Common.Progress
+{
+    public class SimpleProgress<T> : IProgress<T>
+    {
+        public event EventHandler<T> ProgressChanged;
+
+        public void Report(T value)
+        {
+            ProgressChanged?.Invoke(this, value);
+        }
+    }
+}
-- 
cgit v1.2.3


From 2cecde658b2bd4a97999c737005c7b06c63b8813 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 11 Jun 2020 22:58:29 +0100
Subject: Update INetworkManager.cs

Editting comments - adding periods
---
 MediaBrowser.Common/Net/INetworkManager.cs | 42 +++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'MediaBrowser.Common/Net')

diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 56b253b2d..74441d68d 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Common.Net
         event EventHandler NetworkChanged;
 
         /// <summary>
-        /// Contains a function to return the list of user defined LAN addresses
+        /// Gets or sets a function to return the list of user defined LAN addresses.
         /// </summary>
         Func<string[]> LocalSubnetsFn { get; set; }
 
@@ -54,44 +54,44 @@ namespace MediaBrowser.Common.Net
         /// <param name="endpoint">The endpoint.</param>
         /// <returns><c>true</c> if [is in local network] [the specified endpoint]; otherwise, <c>false</c>.</returns>
         bool IsInLocalNetwork(string endpoint);
-        
+
         /// <summary>
-        /// Investigates an caches a list of interface addresses, excluding local link and LAN excluded addresses
+        /// Investigates an caches a list of interface addresses, excluding local link and LAN excluded addresses.
         /// </summary>
-        /// <returns>The list of ipaddresses</returns>
+        /// <returns>The list of ipaddresses.</returns>
         IPAddress[] GetLocalIpAddresses();
-       
-        /// <summary>
+
+		/// <summary>
         /// Checks if the given address falls within the ranges given in [subnets]. The addresses in subnets can be hosts or subnets in the CIDR format.
         /// </summary>
-        /// <param name="addressString">The address to check</param>
-        /// <param name="subnets">If true, check against addresses in the LAN settings surrounded by brackets ([])</param>
+        /// <param name="addressString">The address to check.</param>
+        /// <param name="subnets">If true, check against addresses in the LAN settings surrounded by brackets ([]).</param>
         /// <returns><c>true</c>if the address is in at least one of the given subnets, <c>false</c> otherwise.</returns>
         bool IsAddressInSubnets(string addressString, string[] subnets);
 
         /// <summary>
-        /// Returns true if address is in the LAN list in the config file
+        /// Returns true if address is in the LAN list in the config file.
         /// </summary>
-        /// <param name="address">The address to check</param>
-        /// <param name="excludeInterfaces">If true, check against addresses in the LAN settings which have [] arroud and return true if it matches the address give in address</param>
-        /// <param name="excludeRFC">If true, returns false if address is in the 127.x.x.x or 169.128.x.x range</param>
-        /// <returns><c>false</c>if the address isn't in the LAN list, <c>true</c> if the address has been defined as a LAN address</returns>
+        /// <param name="address">The address to check.</param>
+        /// <param name="excludeInterfaces">If true, check against addresses in the LAN settings which have [] arroud and return true if it matches the address give in address.</param>
+        /// <param name="excludeRFC">If true, returns false if address is in the 127.x.x.x or 169.128.x.x range.</param>
+        /// <returns><c>false</c>if the address isn't in the LAN list, <c>true</c> if the address has been defined as a LAN address.</returns>
         bool IsAddressInSubnets(IPAddress address, bool excludeInterfaces, bool excludeRFC);
 
         /// <summary>
-        /// Checks if address is in the LAN list in the config file
+        /// Checks if address is in the LAN list in the config file.
         /// </summary>
-        /// <param name="address1">Source address to check</param>
-        /// <param name="address2">Destination address to check against</param>
-        /// <param name="subnetMask">Destination subnet to check against</param>
-        /// <returns><c>true/false</c>depending on whether address1 is in the same subnet as IPAddress2 with subnetMas</returns>
+        /// <param name="address1">Source address to check.</param>
+        /// <param name="address2">Destination address to check against.</param>
+        /// <param name="subnetMask">Destination subnet to check against.</param>
+        /// <returns><c>true/false</c>depending on whether address1 is in the same subnet as IPAddress2 with subnetMask.</returns>
         bool IsInSameSubnet(IPAddress address1, IPAddress address2, IPAddress subnetMask);
 
         /// <summary>
-        /// Returns the subnet mask of an interface with the given address
+        /// Returns the subnet mask of an interface with the given address.
         /// </summary>
-        /// <param name="address">The address to check</param>
-        /// <returns>Returns the subnet mask of an interface with the given address, or null if an interface match cannot be found</returns>
+        /// <param name="address">The address to check.</param>
+        /// <returns>Returns the subnet mask of an interface with the given address, or null if an interface match cannot be found.</returns>
         IPAddress GetLocalIpSubnetMask(IPAddress address);
     }
 }
-- 
cgit v1.2.3


From 306f7b3c309da4d88d643d050338b0168b430a0b Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Thu, 11 Jun 2020 23:10:13 +0100
Subject: Update INetworkManager.cs

---
 MediaBrowser.Common/Net/INetworkManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Common/Net')

diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 74441d68d..a0330afef 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -61,7 +61,7 @@ namespace MediaBrowser.Common.Net
         /// <returns>The list of ipaddresses.</returns>
         IPAddress[] GetLocalIpAddresses();
 
-		/// <summary>
+        /// <summary>
         /// Checks if the given address falls within the ranges given in [subnets]. The addresses in subnets can be hosts or subnets in the CIDR format.
         /// </summary>
         /// <param name="addressString">The address to check.</param>
-- 
cgit v1.2.3