Luke Pulverenti 10 éve
szülő
commit
e221902088

+ 40 - 0
MediaBrowser.Common.Implementations/Networking/BaseNetworkManager.cs

@@ -26,6 +26,46 @@ namespace MediaBrowser.Common.Implementations.Networking
             return GetLocalIpAddressesFallback();
         }
 
+        public bool IsInLocalNetwork(string endpoint)
+        {
+            if (string.IsNullOrWhiteSpace(endpoint))
+            {
+                throw new ArgumentNullException("endpoint");
+            }
+
+            IPAddress address;
+            if (!IPAddress.TryParse(endpoint, out address))
+            {
+                return true;
+            }
+
+            const int lengthMatch = 4;
+
+            if (endpoint.Length >= lengthMatch)
+            {
+                var prefix = endpoint.Substring(0, lengthMatch);
+
+                if (GetLocalIpAddresses()
+                    .Any(i => i.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)))
+                {
+                    return true;
+                }
+            }
+
+            // 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("10.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("192.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase) ||
+                endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase);
+        }
+
         private IEnumerable<IPAddress> GetIPsDefault()
         {
             foreach (var adapter in NetworkInterface.GetAllNetworkInterfaces())

+ 1 - 1
MediaBrowser.Server.Mono/Native/NativeApp.cs

@@ -64,7 +64,7 @@ namespace MediaBrowser.ServerApplication.Native
             
         }
 
-        public Task<CheckForUpdateResult> CheckForApplicationUpdate(Version currentVersion,
+        public static Task<CheckForUpdateResult> CheckForApplicationUpdate(Version currentVersion,
             PackageVersionClass updateLevel,
             IInstallationManager installationManager,
             CancellationToken cancellationToken,

+ 0 - 40
MediaBrowser.ServerApplication/Networking/NetworkManager.cs

@@ -44,46 +44,6 @@ namespace MediaBrowser.ServerApplication.Networking
             };
         }
 
-        public bool IsInLocalNetwork(string endpoint)
-        {
-            if (string.IsNullOrWhiteSpace(endpoint))
-            {
-                throw new ArgumentNullException("endpoint");
-            }
-
-            IPAddress address;
-            if (!IPAddress.TryParse(endpoint, out address))
-            {
-                return true;
-            }
-
-            const int lengthMatch = 4;
-
-            if (endpoint.Length >= lengthMatch)
-            {
-                var prefix = endpoint.Substring(0, lengthMatch);
-
-                if (GetLocalIpAddresses()
-                    .Any(i => i.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)))
-                {
-                    return true;
-                }
-            }
-
-            // 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("10.", StringComparison.OrdinalIgnoreCase) ||
-                endpoint.StartsWith("192.", StringComparison.OrdinalIgnoreCase) ||
-                endpoint.StartsWith("172.", StringComparison.OrdinalIgnoreCase) ||
-                endpoint.StartsWith("169.", StringComparison.OrdinalIgnoreCase);
-        }
-
         /// <summary>
         /// To the type of the network share.
         /// </summary>