Adding OSPlatform Processing

2dust · Aug 27, 2024 · 54c16ca · 54c16ca
1 parent ae3ab15
commit 54c16ca
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 27 deletions.
diff --git a/v2rayN/ServiceLib/Common/Utils.cs b/v2rayN/ServiceLib/Common/Utils.cs
@@ -495,29 +495,6 @@ public static bool IsIpv6(string ip)
 
         #region 测速
 
-        /// <summary>
-        /// 取得本机 IP Address
-        /// </summary>
-        /// <returns></returns>
-        //public static List<string> GetHostIPAddress()
-        //{
-        //    List<string> lstIPAddress = new List<string>();
-        //    try
-        //    {
-        //        IPHostEntry IpEntry = Dns.GetHostEntry(Dns.GetHostName());
-        //        foreach (IPAddress ipa in IpEntry.AddressList)
-        //        {
-        //            if (ipa.AddressFamily == AddressFamily.InterNetwork)
-        //                lstIPAddress.Add(ipa.ToString());
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        SaveLog(ex.Message, ex);
-        //    }
-        //    return lstIPAddress;
-        //}
-
         public static void SetSecurityProtocol(bool enableSecurityProtocolTls13)
         {
             if (enableSecurityProtocolTls13)
@@ -708,7 +685,7 @@ public static Dictionary<string, string> GetSystemHosts()
 
         public static string GetExeName(string name)
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (IsWindows())
             {
                 return $"{name}.exe";
             }
@@ -718,6 +695,12 @@ public static string GetExeName(string name)
             }
         }
 
+        public static bool IsWindows() => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+
+        public static bool IsLinux() => RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+
+        public static bool IsOSX() => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
+
         #endregion 杂项
 
         #region TempPath

diff --git a/v2rayN/ServiceLib/Handler/LazyConfig.cs b/v2rayN/ServiceLib/Handler/LazyConfig.cs
@@ -54,7 +54,7 @@ public int GetLocalPort(EInboundProtocol protocol)
 
         public void AddProcess(IntPtr processHandle)
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (Utils.IsWindows())
             {
                 _processJob ??= new();
                 _processJob?.AddProcess(processHandle);

diff --git a/v2rayN/ServiceLib/Handler/UpdateHandler.cs b/v2rayN/ServiceLib/Handler/UpdateHandler.cs
@@ -444,7 +444,7 @@ private void ResponseHandler(ECoreType type, string gitHubReleaseApi, bool preRe
 
         private string? GetUrlFromCore(CoreInfo? coreInfo)
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (Utils.IsWindows())
             {
                 return RuntimeInformation.ProcessArchitecture switch
                 {
@@ -454,7 +454,7 @@ private void ResponseHandler(ECoreType type, string gitHubReleaseApi, bool preRe
                     _ => null,
                 };
             }
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            else if (Utils.IsLinux())
             {
                 return RuntimeInformation.ProcessArchitecture switch
                 {