1 files changed, 39 insertions, 20 deletions

diff --git a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
index 8159be634..bf6ebf7ef 100644
--- a/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
+++ b/MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs
@@ -24,14 +24,46 @@ namespace MediaBrowser.Common.Implementations.Networking
         /// <returns>IPAddress.</returns>
         public IEnumerable<string> GetLocalIpAddresses()
         {
-            var list = GetIPsDefault().Where(i => !IPAddress.IsLoopback(i)).Select(i => i.ToString()).ToList();
+            var list = GetIPsDefault()
+                .Where(i => !IPAddress.IsLoopback(i))
+                .Select(i => i.ToString())
+                .Where(FilterIpAddress)
+                .ToList();
 
             if (list.Count > 0)
             {
                 return list;
             }
 
-            return GetLocalIpAddressesFallback();
+            return GetLocalIpAddressesFallback().Where(FilterIpAddress);
+        }
+
+        private bool FilterIpAddress(string address)
+        {
+            if (address.StartsWith("169.", StringComparison.OrdinalIgnoreCase))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        private bool IsInPrivateAddressSpace(string endpoint)
+        {
+            // Private address space:
+            // http://en.wikipedia.org/wiki/Private_network
+
+            return
+
+                // If url was requested with computer name, we may see this
+                endpoint.IndexOf("::", StringComparison.OrdinalIgnoreCase) != -1 ||
+
+                endpoint.StartsWith("localhost", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("127.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("192.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase);
         }
 
         public bool IsInLocalNetwork(string endpoint)
@@ -46,6 +78,11 @@ namespace MediaBrowser.Common.Implementations.Networking
                 throw new ArgumentNullException("endpoint");
             }
 
+            if (IsInPrivateAddressSpace(endpoint))
+            {
+                return true;
+            }
+
             const int lengthMatch = 4;
 
             if (endpoint.Length >= lengthMatch)
@@ -59,24 +96,6 @@ namespace MediaBrowser.Common.Implementations.Networking
                 }
             }
 
-            // Private address space:
-            // http://en.wikipedia.org/wiki/Private_network
-
-            var isPrivate =
-
-                // If url was requested with computer name, we may see this
-                endpoint.IndexOf("::", StringComparison.OrdinalIgnoreCase) != -1 ||
-
-                endpoint.StartsWith("10.", StringComparison.OrdinalIgnoreCase) ||
-                endpoint.StartsWith("192.", StringComparison.OrdinalIgnoreCase) ||
-                endpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase) ||
-                endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase);
-
-            if (isPrivate)
-            {
-                return true;
-            }
-
             IPAddress address;
             if (resolveHost && !IPAddress.TryParse(endpoint, out address))
             {