v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.19.0</Version>
+        <Version>7.18.0</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -5,10 +5,10 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.4.1" />
+    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.4.0" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.12" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.11" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.12" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.11" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.12" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.11" />
     <PackageVersion Include="ReactiveUI.Avalonia" Version="11.3.8" />
     <PackageVersion Include="CliWrap" Version="3.10.0" />
     <PackageVersion Include="Downloader" Version="4.0.3" />
@@ -19,9 +19,9 @@
     <PackageVersion Include="ReactiveUI" Version="22.3.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
     <PackageVersion Include="ReactiveUI.WPF" Version="22.3.1" />
-    <PackageVersion Include="Semi.Avalonia" Version="11.3.7.3" />
+    <PackageVersion Include="Semi.Avalonia" Version="11.3.7.2" />
     <PackageVersion Include="Semi.Avalonia.AvaloniaEdit" Version="11.2.0.1" />
-    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.3" />
+    <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.3.7.2" />
     <PackageVersion Include="NLog" Version="6.1.0" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
     <PackageVersion Include="TaskScheduler" Version="2.12.2" />

v2rayN/ServiceLib/Common/Utils.cs

@@ -629,7 +629,12 @@ public class Utils
     {
         try
         {
-            var (lstIpEndPoints, lstTcpConns) = GetActiveNetworkInfo();
+            List<IPEndPoint> lstIpEndPoints = new();
+            List<TcpConnectionInformation> lstTcpConns = new();
+
+            lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+            lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
+            lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
 
             if (lstIpEndPoints?.FindIndex(it => it.Port == port) >= 0)
             {
@@ -671,27 +676,6 @@ public class Utils
         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/Handler/ConfigHandler.cs

@@ -1235,63 +1235,31 @@ public static class ConfigHandler
     /// <returns>A SOCKS profile item or null if not needed</returns>
     public static ProfileItem? GetPreSocksItem(Config config, ProfileItem node, ECoreType coreType)
     {
-        if (node.ConfigType != EConfigType.Custom || !(node.PreSocksPort > 0))
-        {
-            return null;
-        }
         ProfileItem? itemSocks = null;
-        var preCoreType = AppManager.Instance.RunningCoreType = config.TunModeItem.EnableTun ? ECoreType.sing_box : ECoreType.Xray;
+        if (node.ConfigType != EConfigType.Custom && coreType != ECoreType.sing_box && config.TunModeItem.EnableTun)
-        itemSocks = new ProfileItem()
         {
-            CoreType = preCoreType,
+            itemSocks = new ProfileItem()
-            ConfigType = EConfigType.SOCKS,
+            {
-            Address = Global.Loopback,
+                CoreType = ECoreType.sing_box,
-            Port = node.PreSocksPort.Value,
+                ConfigType = EConfigType.SOCKS,
-        };
+                Address = Global.Loopback,
+                Port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks)
+            };
+        }
+        else if (node.ConfigType == EConfigType.Custom && node.PreSocksPort > 0)
+        {
+            var preCoreType = AppManager.Instance.RunningCoreType = config.TunModeItem.EnableTun ? ECoreType.sing_box : ECoreType.Xray;
+            itemSocks = new ProfileItem()
+            {
+                CoreType = preCoreType,
+                ConfigType = EConfigType.SOCKS,
+                Address = Global.Loopback,
+                Port = node.PreSocksPort.Value,
+            };
+        }
         return itemSocks;
     }
 
-    public static CoreConfigContext? GetPreSocksCoreConfigContext(CoreConfigContext nodeContext)
-    {
-        var config = nodeContext.AppConfig;
-        var node = nodeContext.Node;
-        var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
-
-        var preSocksItem = GetPreSocksItem(config, node, coreType);
-        if (preSocksItem != null)
-        {
-            return nodeContext with { Node = preSocksItem, };
-        }
-
-        if ((!nodeContext.IsTunEnabled)
-            || coreType != ECoreType.Xray
-            || node.ConfigType == EConfigType.Custom)
-        {
-            return null;
-        }
-        var tunProtectSsPort = Utils.GetFreePort();
-        var proxyRelaySsPort = Utils.GetFreePort();
-        var preItem = new ProfileItem()
-        {
-            CoreType = ECoreType.sing_box,
-            ConfigType = EConfigType.Shadowsocks,
-            Address = Global.Loopback,
-            Port = proxyRelaySsPort,
-            Password = Global.None,
-        };
-        preItem.SetProtocolExtra(preItem.GetProtocolExtra() with
-        {
-            SsMethod = Global.None,
-        });
-        var preContext = nodeContext with
-        {
-            Node = preItem,
-            TunProtectSsPort = tunProtectSsPort,
-            ProxyRelaySsPort = proxyRelaySsPort,
-        };
-        return preContext;
-    }
-
     /// <summary>
     /// Remove servers with invalid test results (timeout)
     /// Useful for cleaning up subscription lists

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -159,8 +159,7 @@ public static class CoreConfigHandler
             IsTunEnabled = config.TunModeItem.EnableTun,
             SimpleDnsItem = config.SimpleDNSItem,
             ProtectDomainList = [],
-            TunProtectSsPort = 0,
+            ProtectSocksPort = 0,
-            ProxyRelaySsPort = 0,
             RawDnsItem = await AppManager.Instance.GetDNSItem(coreType),
             RoutingItem = await ConfigHandler.GetDefaultRouting(config),
         };

v2rayN/ServiceLib/Manager/CoreManager.cs

@@ -67,15 +67,7 @@ public class CoreManager
 
         var fileName = Utils.GetBinConfigPath(Global.CoreConfigFileName);
         var context = await CoreConfigHandler.BuildCoreConfigContext(_config, node);
-        var preContext = ConfigHandler.GetPreSocksCoreConfigContext(context);
+        context = context with { IsTunEnabled = _config.TunModeItem.EnableTun };
-        if (preContext is not null)
-        {
-            context = context with
-            {
-                TunProtectSsPort = preContext.TunProtectSsPort,
-                ProxyRelaySsPort = preContext.ProxyRelaySsPort,
-            };
-        }
         var result = await CoreConfigHandler.GenerateClientConfig(context, fileName);
         if (result.Success != true)
         {
@@ -96,7 +88,7 @@ public class CoreManager
         }
 
         await CoreStart(context);
-        await CoreStartPreService(preContext);
+        await CoreStartPreService(context);
         if (_processService != null)
         {
             await UpdateFunc(true, $"{node.GetSummary()}");
@@ -191,22 +183,30 @@ public class CoreManager
         _processService = proc;
     }
 
-    private async Task CoreStartPreService(CoreConfigContext? preContext)
+    private async Task CoreStartPreService(CoreConfigContext context)
     {
-        if (_processService is { HasExited: false } && preContext != null)
+        var node = context.Node;
+        if (_processService != null && !_processService.HasExited)
         {
-            var preCoreType = preContext?.Node?.CoreType ?? ECoreType.sing_box;
+            var coreType = AppManager.Instance.GetCoreType(node, node.ConfigType);
-            var fileName = Utils.GetBinConfigPath(Global.CorePreConfigFileName);
+            var itemSocks = ConfigHandler.GetPreSocksItem(_config, node, coreType);
-            var result = await CoreConfigHandler.GenerateClientConfig(preContext, fileName);
+            if (itemSocks != null)
-            if (result.Success)
             {
-                var coreInfo = CoreInfoManager.Instance.GetCoreInfo(preCoreType);
+                var preCoreType = itemSocks.CoreType ?? ECoreType.sing_box;
-                var proc = await RunProcess(coreInfo, Global.CorePreConfigFileName, true, true);
+                var fileName = Utils.GetBinConfigPath(Global.CorePreConfigFileName);
-                if (proc is null)
+                var itemSocksContext = await CoreConfigHandler.BuildCoreConfigContext(_config, itemSocks);
+                itemSocksContext.ProtectDomainList.AddRangeSafe(context.ProtectDomainList);
+                var result = await CoreConfigHandler.GenerateClientConfig(itemSocksContext, fileName);
+                if (result.Success)
                 {
-                    return;
+                    var coreInfo = CoreInfoManager.Instance.GetCoreInfo(preCoreType);
+                    var proc = await RunProcess(coreInfo, Global.CorePreConfigFileName, true, true);
+                    if (proc is null)
+                    {
+                        return;
+                    }
+                    _processPreService = proc;
                 }
-                _processPreService = proc;
             }
         }
     }

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -144,6 +144,7 @@ public class TunModeItem
     public bool StrictRoute { get; set; } = true;
     public string Stack { get; set; }
     public int Mtu { get; set; }
+    public bool EnableExInbound { get; set; }
     public bool EnableIPv6Address { get; set; }
 }
 

v2rayN/ServiceLib/Models/CoreConfigContext.cs

@@ -16,9 +16,5 @@ 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
+    public int ProtectSocksPort { get; init; } = 0;
-    // -> proxy core (relay inbound --> proxy outbound --(dialerProxy)--> protect outbound)
-    // -> protect inbound -> direct proxy outbound data -> internet
-    public int TunProtectSsPort { get; init; } = 0;
-    public int ProxyRelaySsPort { get; init; } = 0;
 }

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -257,7 +257,6 @@ 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/Models/V2rayConfig.cs

@@ -472,7 +472,7 @@ public class HysteriaSettings4Ray
 
 public class HysteriaUdpHop4Ray
 {
-    public string? port { get; set; }
+    public string? ports { get; set; }
     public string? interval { get; set; }
 }
 

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -3780,6 +3780,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable additional Inbound 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableExInbound {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableExInbound", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Enable fragment 的本地化字符串。
         /// </summary>
@@ -3789,6 +3798,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 which conflicts with the group previous proxy 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableFragmentTips {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableFragmentTips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Enable hardware acceleration (requires restart) 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -1071,6 +1071,9 @@
   <data name="TbSettingsTunMtu" xml:space="preserve">
     <value>MTU</value>
   </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>فعال سازی additional Inbound</value>
+  </data>
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>فعال سازی آدرس IPv6</value>
   </data>
@@ -1110,6 +1113,9 @@
   <data name="menuAddHttpServer" xml:space="preserve">
     <value>افزودن سرور [HTTP]</value>
   </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>which conflicts with the group previous proxy</value>
+  </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>فعال کردن فرگمنت</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.fr.resx

@@ -1068,6 +1068,9 @@
   <data name="TbSettingsTunMtu" xml:space="preserve">
     <value>MTU</value>
   </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>Activer un port d’écoute supplémentaire</value>
+  </data>
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>Activer IPv6</value>
   </data>
@@ -1107,6 +1110,9 @@
   <data name="menuAddHttpServer" xml:space="preserve">
     <value>Ajouter [HTTP]</value>
   </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>En conflit avec le proxy amont de groupe</value>
+  </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>Activer le fragmentation (Fragment)</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.hu.resx

@@ -1071,6 +1071,9 @@
   <data name="TbSettingsTunMtu" xml:space="preserve">
     <value>MTU</value>
   </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>További bejövő engedélyezése</value>
+  </data>
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>IPv6 cím engedélyezése</value>
   </data>
@@ -1110,6 +1113,9 @@
   <data name="menuAddHttpServer" xml:space="preserve">
     <value>HTTP konfiguráció hozzáadása</value>
   </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>which conflicts with the group previous proxy</value>
+  </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>Fragment engedélyezése</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1071,6 +1071,9 @@
   <data name="TbSettingsTunMtu" xml:space="preserve">
     <value>MTU</value>
   </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>Enable additional Inbound</value>
+  </data>
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>Enable IPv6 Address</value>
   </data>
@@ -1110,6 +1113,9 @@
   <data name="menuAddHttpServer" xml:space="preserve">
     <value>Add [HTTP]</value>
   </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>which conflicts with the group previous proxy</value>
+  </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>Enable fragment</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1071,6 +1071,9 @@
   <data name="TbSettingsTunMtu" xml:space="preserve">
     <value>MTU</value>
   </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>Включить дополнительный входящий канал</value>
+  </data>
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>Включить IPv6 адреса</value>
   </data>
@@ -1110,6 +1113,9 @@
   <data name="menuAddHttpServer" xml:space="preserve">
     <value>Добавить сервер [HTTP]</value>
   </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>что конфликтует с предыдущим прокси группы</value>
+  </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>Включить фрагментацию (Fragment)</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -1068,6 +1068,9 @@
   <data name="TbSettingsTunMtu" xml:space="preserve">
     <value>MTU</value>
   </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>启用额外监听端口</value>
+  </data>
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>启用 IPv6</value>
   </data>
@@ -1107,6 +1110,9 @@
   <data name="menuAddHttpServer" xml:space="preserve">
     <value>添加 [HTTP] </value>
   </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>和分组前置代理冲突</value>
+  </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>启用分片 (Fragment)</value>
   </data>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -1068,6 +1068,9 @@
   <data name="TbSettingsTunMtu" xml:space="preserve">
     <value>MTU</value>
   </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>啟用額外偵聽連接埠</value>
+  </data>
   <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
     <value>啟用 IPv6</value>
   </data>
@@ -1107,6 +1110,9 @@
   <data name="menuAddHttpServer" xml:space="preserve">
     <value>新增 [HTTP] 節點</value>
   </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>和分組前置代理衝突</value>
+  </data>
   <data name="TbSettingsEnableFragment" xml:space="preserve">
     <value>啟用分片（Fragment）</value>
   </data>

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

@@ -61,51 +61,6 @@ public partial class CoreConfigSingboxService(CoreConfigContext context)
             ret.Success = true;
 
             ret.Data = ApplyFullConfigTemplate();
-            if (context.TunProtectSsPort is > 0 and <= 65535)
-            {
-                var ssInbound = new
-                {
-                    type = "shadowsocks",
-                    tag = "tun-protect-ss",
-                    listen = Global.Loopback,
-                    listen_port = context.TunProtectSsPort,
-                    method = "none",
-                    password = "none",
-                };
-                var directRule = new Rule4Sbox()
-                {
-                    inbound = new List<string> { ssInbound.tag },
-                    outbound = Global.DirectTag,
-                };
-                var singboxConfigNode = JsonUtils.ParseJson(ret.Data.ToString())!.AsObject();
-                var inboundsNode = singboxConfigNode["inbounds"]!.AsArray();
-                inboundsNode.Add(JsonUtils.SerializeToNode(ssInbound, new JsonSerializerOptions
-                {
-                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-                }));
-                var routeNode = singboxConfigNode["route"]?.AsObject();
-                var rulesNode = routeNode?["rules"]?.AsArray();
-                var protectRuleNode = JsonUtils.SerializeToNode(directRule,
-                    new JsonSerializerOptions { DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull });
-                if (rulesNode != null)
-                {
-                    rulesNode.Insert(0, protectRuleNode);
-                }
-                else
-                {
-                    var newRulesNode = new JsonArray() { protectRuleNode };
-                    if (routeNode is null)
-                    {
-                        var newRouteNode = new JsonObject() { ["rules"] = newRulesNode };
-                        singboxConfigNode["route"] = newRouteNode;
-                    }
-                    else
-                    {
-                        routeNode["rules"] = newRulesNode;
-                    }
-                }
-                ret.Data = JsonUtils.Serialize(singboxConfigNode);
-            }
             return ret;
         }
         catch (Exception ex)
@@ -137,8 +92,18 @@ public partial class CoreConfigSingboxService(CoreConfigContext context)
                 ret.Msg = ResUI.FailedGenDefaultConfiguration;
                 return ret;
             }
-
+            List<IPEndPoint> lstIpEndPoints = new();
-            var (lstIpEndPoints, lstTcpConns) = Utils.GetActiveNetworkInfo();
+            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);
+            }
 
             GenLog();
             GenMinimizedDns();

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

@@ -7,11 +7,10 @@ public partial class CoreConfigSingboxService
         try
         {
             var listen = "0.0.0.0";
-            var listenPort = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
             _coreConfig.inbounds = [];
 
-            if (!context.IsTunEnabled
+            if (!_config.TunModeItem.EnableTun
-                || (context.IsTunEnabled && _node.Port != listenPort))
+                || (_config.TunModeItem.EnableTun && _config.TunModeItem.EnableExInbound && AppManager.Instance.RunningCoreType == ECoreType.sing_box))
             {
                 var inbound = new Inbound4Sbox()
                 {
@@ -21,7 +20,7 @@ public partial class CoreConfigSingboxService
                 };
                 _coreConfig.inbounds.Add(inbound);
 
-                inbound.listen_port = listenPort;
+                inbound.listen_port = AppManager.Instance.GetLocalPort(EInboundProtocol.socks);
 
                 if (_config.Inbound.First().SecondLocalPortEnabled)
                 {
@@ -50,7 +49,7 @@ public partial class CoreConfigSingboxService
                 }
             }
 
-            if (context.IsTunEnabled)
+            if (_config.TunModeItem.EnableTun)
             {
                 if (_config.TunModeItem.Mtu <= 0)
                 {

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

@@ -43,7 +43,6 @@ public partial class CoreConfigSingboxService
             case EConfigType.PolicyGroup:
                 proxyOutboundList = BuildOutboundsList(baseTagName);
                 break;
-
             case EConfigType.ProxyChain:
                 proxyOutboundList = BuildChainOutboundsList(baseTagName);
                 break;

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

@@ -15,10 +15,6 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
         var ret = new RetResult();
         try
         {
-            if (context.IsTunEnabled && context.TunProtectSsPort > 0 && context.ProxyRelaySsPort > 0)
-            {
-                return GenerateClientProxyRelayConfig();
-            }
             if (_node == null
                 || !_node.IsValid())
             {
@@ -94,8 +90,18 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
                 ret.Msg = ResUI.FailedGenDefaultConfiguration;
                 return ret;
             }
-
+            List<IPEndPoint> lstIpEndPoints = new();
-            var (lstIpEndPoints, lstTcpConns) = Utils.GetActiveNetworkInfo();
+            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);
+            }
 
             GenLog();
             _coreConfig.inbounds.Clear();
@@ -257,106 +263,5 @@ public partial class CoreConfigV2rayService(CoreConfigContext context)
         }
     }
 
-    public RetResult GenerateClientProxyRelayConfig()
-    {
-        var ret = new RetResult();
-        try
-        {
-            if (_node == null
-                || !_node.IsValid())
-            {
-                ret.Msg = ResUI.CheckServerSettings;
-                return ret;
-            }
-
-            if (_node.GetNetwork() is nameof(ETransport.quic))
-            {
-                ret.Msg = ResUI.Incorrectconfiguration + $" - {_node.GetNetwork()}";
-                return ret;
-            }
-
-            var result = EmbedUtils.GetEmbedText(Global.V2raySampleClient);
-            if (result.IsNullOrEmpty())
-            {
-                ret.Msg = ResUI.FailedGetDefaultConfiguration;
-                return ret;
-            }
-
-            _coreConfig = JsonUtils.Deserialize<V2rayConfig>(result);
-            if (_coreConfig == null)
-            {
-                ret.Msg = ResUI.FailedGenDefaultConfiguration;
-                return ret;
-            }
-
-            GenLog();
-            _coreConfig.outbounds.Clear();
-            GenOutbounds();
-
-            var protectNode = new ProfileItem()
-            {
-                CoreType = ECoreType.Xray,
-                ConfigType = EConfigType.Shadowsocks,
-                Address = Global.Loopback,
-                Port = context.TunProtectSsPort,
-                Password = Global.None,
-            };
-            protectNode.SetProtocolExtra(protectNode.GetProtocolExtra() with
-            {
-                SsMethod = Global.None,
-            });
-
-            foreach (var outbound in _coreConfig.outbounds.Where(outbound => outbound.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true))
-            {
-                outbound.streamSettings ??= new StreamSettings4Ray();
-                outbound.streamSettings.sockopt ??= new Sockopt4Ray();
-                outbound.streamSettings.sockopt.dialerProxy = "tun-project-ss";
-            }
-            _coreConfig.outbounds.Add(new CoreConfigV2rayService(context with
-            {
-                Node = protectNode,
-            }).BuildProxyOutbound("tun-project-ss"));
-
-            var hasBalancer = _coreConfig.routing.balancers is { Count: > 0 };
-            _coreConfig.routing.rules =
-            [
-                new()
-                {
-                    inboundTag = new List<string> { "proxy-relay-ss" },
-                    outboundTag = hasBalancer ? null : Global.ProxyTag,
-                    balancerTag = hasBalancer ? Global.ProxyTag + Global.BalancerTagSuffix: null,
-                    type = "field"
-                }
-            ];
-            _coreConfig.inbounds.Clear();
-
-            var configNode = JsonUtils.ParseJson(JsonUtils.Serialize(_coreConfig))!;
-            configNode["inbounds"]!.AsArray().Add(new
-            {
-                listen = Global.Loopback,
-                port = context.ProxyRelaySsPort,
-                protocol = "shadowsocks",
-                settings = new
-                {
-                    network = "tcp,udp",
-                    method = Global.None,
-                    password = Global.None,
-                },
-                tag = "proxy-relay-ss",
-            });
-
-            ret.Msg = string.Format(ResUI.SuccessfulConfiguration, "");
-            ret.Success = true;
-            ret.Data = JsonUtils.Serialize(configNode);
-            return ret;
-        }
-        catch (Exception ex)
-        {
-            Logging.SaveLog(_tag, ex);
-            ret.Msg = ResUI.FailedGenDefaultConfiguration;
-            return ret;
-        }
-    }
-
     #endregion public gen function
 }

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

@@ -31,7 +31,7 @@ public partial class CoreConfigV2rayService
             var fragmentOutbound = new Outbounds4Ray
             {
                 protocol = "freedom",
-                tag = $"frag-{baseTagName}",
+                tag = $"frag-{Global.ProxyTag}",
                 settings = new()
                 {
                     fragment = new()
@@ -44,17 +44,16 @@ public partial class CoreConfigV2rayService
             };
             var actOutboundWithTlsList =
                 proxyOutboundList.Where(n => n.streamSettings?.security.IsNullOrEmpty() == false
-                                             && (n.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true)).ToList();
+                                             && (n.streamSettings?.sockopt?.dialerProxy?.IsNullOrEmpty() ?? true));
-            if (actOutboundWithTlsList.Count > 0)
-            {
-                proxyOutboundList.Add(fragmentOutbound);
-            }
             foreach (var outbound in actOutboundWithTlsList)
             {
+                var fragmentOutboundClone = JsonUtils.DeepCopy(fragmentOutbound);
+                fragmentOutboundClone.tag = $"frag-{outbound.tag}";
                 outbound.streamSettings.sockopt = new()
                 {
-                    dialerProxy = fragmentOutbound.tag
+                    dialerProxy = fragmentOutboundClone.tag
                 };
+                proxyOutboundList.Add(fragmentOutboundClone);
             }
         }
         return proxyOutboundList;
@@ -68,7 +67,6 @@ public partial class CoreConfigV2rayService
             case EConfigType.PolicyGroup:
                 proxyOutboundList.AddRange(BuildOutboundsList(baseTagName));
                 break;
-
             case EConfigType.ProxyChain:
                 proxyOutboundList.AddRange(BuildChainOutboundsList(baseTagName));
                 break;
@@ -603,7 +601,7 @@ public partial class CoreConfigV2rayService
                     {
                         udpHop = new HysteriaUdpHop4Ray
                         {
-                            port = ports.Replace(':', '-'),
+                            ports = ports.Replace(':', '-'),
                             interval = hopInterval,
                         };
                     }

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -95,6 +95,7 @@ public class OptionSettingViewModel : MyReactiveObject
     [Reactive] public bool TunStrictRoute { get; set; }
     [Reactive] public string TunStack { get; set; }
     [Reactive] public int TunMtu { get; set; }
+    [Reactive] public bool TunEnableExInbound { get; set; }
     [Reactive] public bool TunEnableIPv6Address { get; set; }
 
     #endregion Tun mode
@@ -219,6 +220,7 @@ public class OptionSettingViewModel : MyReactiveObject
         TunStrictRoute = _config.TunModeItem.StrictRoute;
         TunStack = _config.TunModeItem.Stack;
         TunMtu = _config.TunModeItem.Mtu;
+        TunEnableExInbound = _config.TunModeItem.EnableExInbound;
         TunEnableIPv6Address = _config.TunModeItem.EnableIPv6Address;
 
         #endregion Tun mode
@@ -378,6 +380,7 @@ public class OptionSettingViewModel : MyReactiveObject
         _config.TunModeItem.StrictRoute = TunStrictRoute;
         _config.TunModeItem.Stack = TunStack;
         _config.TunModeItem.Mtu = TunMtu;
+        _config.TunModeItem.EnableExInbound = TunEnableExInbound;
         _config.TunModeItem.EnableIPv6Address = TunEnableIPv6Address;
 
         //coreType

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -325,6 +325,12 @@
                             Grid.Column="1"
                             Margin="{StaticResource Margin4}"
                             HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="20"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin4}"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableFragmentTips}"
+                            TextWrapping="Wrap" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
@@ -837,6 +843,19 @@
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left" />
 
+                    <TextBlock
+                        Grid.Row="6"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbSettingsEnableExInbound}" />
+                    <ToggleSwitch
+                        x:Name="togEnableExInbound"
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
+
                     <TextBlock
                         Grid.Row="7"
                         Grid.Column="0"

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -114,6 +114,7 @@ public partial class OptionSettingWindow : WindowBase<OptionSettingViewModel>
             this.Bind(ViewModel, vm => vm.TunStrictRoute, v => v.togStrictRoute.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunStack, v => v.cmbStack.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.SelectedValue).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.TunEnableExInbound, v => v.togEnableExInbound.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunEnableIPv6Address, v => v.togEnableIPv6Address.IsChecked).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.SelectedValue).DisposeWith(disposables);

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -391,6 +391,13 @@
                             Grid.Column="1"
                             Margin="{StaticResource Margin8}"
                             HorizontalAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="20"
+                            Grid.Column="2"
+                            Margin="{StaticResource Margin8}"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableFragmentTips}"
+                            TextWrapping="Wrap" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>
@@ -1090,6 +1097,20 @@
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefComboBox}" />
 
+                    <TextBlock
+                        Grid.Row="6"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin8}"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource ToolbarTextBlock}"
+                        Text="{x:Static resx:ResUI.TbSettingsEnableExInbound}" />
+                    <ToggleButton
+                        x:Name="togEnableExInbound"
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Margin="{StaticResource Margin8}"
+                        HorizontalAlignment="Left" />
+
                     <TextBlock
                         Grid.Row="7"
                         Grid.Column="0"

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -119,6 +119,7 @@ public partial class OptionSettingWindow
             this.Bind(ViewModel, vm => vm.TunStrictRoute, v => v.togStrictRoute.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunStack, v => v.cmbStack.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.TunEnableExInbound, v => v.togEnableExInbound.IsChecked).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.TunEnableIPv6Address, v => v.togEnableIPv6Address.IsChecked).DisposeWith(disposables);
 
             this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.Text).DisposeWith(disposables);