Centralize active network info retrieval

Author: 2dust

v2rayN/ServiceLib/Common/Utils.cs

@@ -629,12 +629,7 @@ private static bool PortInUse(int port)
     {
         try
         {
-            List<IPEndPoint> lstIpEndPoints = new();
-            List<TcpConnectionInformation> lstTcpConns = new();
-
-            lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
-            lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
-            lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
+            var (lstIpEndPoints, lstTcpConns) = GetActiveNetworkInfo();
 
             if (lstIpEndPoints?.FindIndex(it => it.Port == port) >= 0)
             {
@@ -676,6 +671,27 @@ public static int GetFreePort(int defaultPort = 0)
         return 59090;
     }
 
+    public static (List<IPEndPoint> endpoints, List<TcpConnectionInformation> connections) GetActiveNetworkInfo()
+    {
+        var endpoints = new List<IPEndPoint>();
+        var connections = new List<TcpConnectionInformation>();
+
+        try
+        {
+            var ipGlobalProperties = IPGlobalProperties.GetIPGlobalProperties();
+
+            endpoints.AddRange(ipGlobalProperties.GetActiveTcpListeners());
+            endpoints.AddRange(ipGlobalProperties.GetActiveUdpListeners());
+            connections.AddRange(ipGlobalProperties.GetActiveTcpConnections());
+        }
+        catch (Exception ex)
+        {
+            Logging.SaveLog(_tag, ex);
+        }
+
+        return (endpoints, connections);
+    }
+
     #endregion Speed Test
 
     #region Miscellaneous

v2rayN/ServiceLib/Manager/CoreManager.cs

@@ -72,7 +72,8 @@ public async Task LoadCore(ProfileItem? node)
         {
             context = context with
             {
-                TunProtectSsPort = preContext.TunProtectSsPort, ProxyRelaySsPort = preContext.ProxyRelaySsPort,
+                TunProtectSsPort = preContext.TunProtectSsPort,
+                ProxyRelaySsPort = preContext.ProxyRelaySsPort,
             };
         }
         var result = await CoreConfigHandler.GenerateClientConfig(context, fileName);

v2rayN/ServiceLib/Models/CoreConfigContext.cs

@@ -16,7 +16,7 @@ public record CoreConfigContext
     // TUN Compatibility
     public bool IsTunEnabled { get; init; } = false;
     public HashSet<string> ProtectDomainList { get; init; } = new();
-    // -> tun inbound --(if routing proxy)--> relay outbound    
+    // -> tun inbound --(if routing proxy)--> relay outbound
     // -> proxy core (relay inbound --> proxy outbound --(dialerProxy)--> protect outbound)
     // -> protect inbound -> direct proxy outbound data -> internet
     public int TunProtectSsPort { get; init; } = 0;

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -257,6 +257,7 @@ public class Server4Sbox : BaseServer4Sbox
 
     // Deprecated in sing-box 1.12.0 , kept for backward compatibility
     public string? address { get; set; }
+
     public string? address_resolver { get; set; }
     public string? address_strategy { get; set; }
     public string? strategy { get; set; }

v2rayN/ServiceLib/Services/CoreConfig/Singbox/CoreConfigSingboxService.cs

@@ -137,18 +137,8 @@ public RetResult GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds)
                 ret.Msg = ResUI.FailedGenDefaultConfiguration;
                 return ret;
             }
-            List<IPEndPoint> lstIpEndPoints = new();
-            List<TcpConnectionInformation> lstTcpConns = new();
-            try
-            {
-                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
-                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
-                lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
+
+            var (lstIpEndPoints, lstTcpConns) = Utils.GetActiveNetworkInfo();
 
             GenLog();
             GenMinimizedDns();

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs

@@ -43,6 +43,7 @@ private List<BaseServer4Sbox> BuildGroupProxyOutbounds(string baseTagName = Glob
             case EConfigType.PolicyGroup:
                 proxyOutboundList = BuildOutboundsList(baseTagName);
                 break;
+
             case EConfigType.ProxyChain:
                 proxyOutboundList = BuildChainOutboundsList(baseTagName);
                 break;

v2rayN/ServiceLib/Services/CoreConfig/V2ray/CoreConfigV2rayService.cs

@@ -94,18 +94,8 @@ public RetResult GenerateClientSpeedtestConfig(List<ServerTestItem> selecteds)
                 ret.Msg = ResUI.FailedGenDefaultConfiguration;
                 return ret;
             }
-            List<IPEndPoint> lstIpEndPoints = new();
-            List<TcpConnectionInformation> lstTcpConns = new();
-            try
-            {
-                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
-                lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
-                lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
-            }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(_tag, ex);
-            }
+
+            var (lstIpEndPoints, lstTcpConns) = Utils.GetActiveNetworkInfo();
 
             GenLog();
             _coreConfig.inbounds.Clear();

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs

@@ -68,6 +68,7 @@ private List<Outbounds4Ray> BuildGroupProxyOutbounds(string baseTagName = Global
             case EConfigType.PolicyGroup:
                 proxyOutboundList.AddRange(BuildOutboundsList(baseTagName));
                 break;
+
             case EConfigType.ProxyChain:
                 proxyOutboundList.AddRange(BuildChainOutboundsList(baseTagName));
                 break;