up 6.47

Update ConfigHandler.cs
https://github.com/2dust/v2rayN/pull/5264
2024-06-24 15:34:41 +08:00 · 2024-06-24 15:25:00 +08:00 · 2024-06-24 15:20:16 +08:00 · 2024-06-24 15:19:42 +08:00 · 2024-06-22 16:44:15 +08:00
22 changed files with 193 additions and 93 deletions
--- a/v2rayN/ProtosLib/ProtosLib.csproj
+++ b/v2rayN/ProtosLib/ProtosLib.csproj
@@ -9,7 +9,7 @@
 	</ItemGroup>

 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.27.0" />
+		<PackageReference Include="Google.Protobuf" Version="3.27.1" />
 		<PackageReference Include="Grpc.Net.Client" Version="2.63.0" />
 		<PackageReference Include="Grpc.Tools" Version="2.64.0">
 			<PrivateAssets>all</PrivateAssets>
--- a/v2rayN/v2rayN/App.xaml.cs
+++ b/v2rayN/v2rayN/App.xaml.cs
@@ -62,7 +62,7 @@ namespace v2rayN
            //Under Win10
            if (Environment.OSVersion.Version.Major < 10)
            {
-                Environment.SetEnvironmentVariable("DOTNET_EnableWriteXorExecute", "0", EnvironmentVariableTarget.Process);
+                Environment.SetEnvironmentVariable("DOTNET_EnableWriteXorExecute", "0", EnvironmentVariableTarget.User);
            }
        }

--- a/v2rayN/v2rayN/Common/Utils.cs
+++ b/v2rayN/v2rayN/Common/Utils.cs
@@ -79,7 +79,7 @@ namespace v2rayN
        /// </summary>
        /// <param name="lst"></param>
        /// <returns></returns>
-        public static string List2String(List<string> lst, bool wrap = false)
+        public static string List2String(List<string>? lst, bool wrap = false)
        {
            try
            {
--- a/v2rayN/v2rayN/Enums/EInboundProtocol.cs
+++ b/v2rayN/v2rayN/Enums/EInboundProtocol.cs
@@ -8,6 +8,7 @@
        http2,
        pac,
        api,
+        api2,
        speedtest = 21
    }
 }
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -23,7 +23,8 @@ namespace v2rayN
        public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
        public const string JuicityCoreUrl = "https://github.com/juicity/juicity/releases";
        public const string CustomRoutingListUrl = @"https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/";
-        public const string SingboxRulesetUrl = @"https://raw.githubusercontent.com/SagerNet/sing-{0}/rule-set/{1}.srs";
+        public const string SingboxRulesetUrlGeosite = @"https://raw.githubusercontent.com/SagerNet/sing-geosite/rule-set/geosite-{0}.srs";
+        public const string SingboxRulesetUrlGeoip = @"https://raw.githubusercontent.com/Loyalsoldier/geoip/release/srs/{0}.srs";

        public const string PromotionUrl = @"aHR0cHM6Ly85LjIzNDQ1Ni54eXovYWJjLmh0bWw=";
        public const string ConfigFileName = "guiNConfig.json";
@@ -174,6 +175,7 @@ namespace v2rayN
        public static readonly List<string> LogLevels = new() { "debug", "info", "warning", "error", "none" };
        public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
        public static readonly List<string> RuleProtocols = new() { "http", "tls", "bittorrent" };
+        public static readonly List<string> RuleNetworks = new() { "", "tcp", "udp", "tcp,udp" };
        public static readonly List<string> destOverrideProtocols = ["http", "tls", "quic", "fakedns", "fakedns+others"];
        public static readonly List<string> TunMtus = new() { "1280", "1408", "1500", "9000" };
        public static readonly List<string> TunStacks = new() { "gvisor", "system" };
--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -1,6 +1,7 @@
 using System.Data;
 using System.IO;
 using System.Text.RegularExpressions;
+using System.Web;
 using v2rayN.Enums;
 using v2rayN.Handler.Fmt;
 using v2rayN.Models;
@@ -1355,18 +1356,27 @@ namespace v2rayN.Handler
        public static int AddSubItem(Config config, string url)
        {
            //already exists
-            if (SQLiteHelper.Instance.Table<SubItem>().Where(e => e.url == url).Count() > 0)
+            if (SQLiteHelper.Instance.Table<SubItem>().Any(e => e.url == url))
            {
                return 0;
            }
-
            SubItem subItem = new()
            {
                id = string.Empty,
-                remarks = "import_sub",
                url = url
            };

+            try
+            {
+                var uri = new Uri(url);
+                var queryVars = HttpUtility.ParseQueryString(uri.Query);
+                subItem.remarks = queryVars["remarks"] ?? "import_sub";
+            }
+            catch (UriFormatException)
+            {
+                return 0;
+            }
+
            return AddSubItem(config, subItem);
        }

@@ -1615,7 +1625,7 @@ namespace v2rayN.Handler

        public static int InitBuiltinRouting(Config config, bool blImportAdvancedRules = false)
        {
-            var ver = "V2-";
+            var ver = "V3-";
            var items = LazyConfig.Instance.RoutingItems();
            if (blImportAdvancedRules || items.Where(t => t.remarks.StartsWith(ver)).ToList().Count <= 0)
            {
--- a/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigHandler.cs
@@ -27,7 +27,7 @@ namespace v2rayN.Handler.CoreConfig
                {
                    return GenerateClientCustomConfig(node, fileName, out msg);
                }
-                else if (config.tunModeItem.enableTun || LazyConfig.Instance.GetCoreType(node, node.configType) == ECoreType.sing_box)
+                else if (LazyConfig.Instance.GetCoreType(node, node.configType) == ECoreType.sing_box)
                {
                    var configGenSingbox = new CoreConfigSingbox(config);
                    if (configGenSingbox.GenerateClientConfigContent(node, out SingboxConfig? singboxConfig, out msg) != 0)
--- a/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigSingbox.cs
@@ -120,7 +120,8 @@ namespace v2rayN.Handler.CoreConfig
                var listen = "::";
                singboxConfig.inbounds = [];

-                if (!_config.tunModeItem.enableTun || _config.tunModeItem.enableTun && _config.tunModeItem.enableExInbound)
+                if (!_config.tunModeItem.enableTun
+                    || (_config.tunModeItem.enableTun && _config.tunModeItem.enableExInbound && _config.runningCoreType == ECoreType.sing_box))
                {
                    var inbound = new Inbound4Sbox()
                    {
@@ -191,7 +192,7 @@ namespace v2rayN.Handler.CoreConfig
                    tunInbound.strict_route = _config.tunModeItem.strictRoute;
                    tunInbound.stack = _config.tunModeItem.stack;
                    tunInbound.sniff = _config.inbound[0].sniffingEnabled;
-                    tunInbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
+                    //tunInbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
                    if (_config.tunModeItem.enableIPv6Address == false)
                    {
                        tunInbound.inet6_address = null;
@@ -552,7 +553,7 @@ namespace v2rayN.Handler.CoreConfig
                    singboxConfig.route.rules.Add(new()
                    {
                        port = [53],
-                        network = "udp",
+                        network = ["udp"],
                        outbound = dnsOutbound
                    });
                }
@@ -668,6 +669,10 @@ namespace v2rayN.Handler.CoreConfig
                        rule.port = new List<int> { Utils.ToInt(item.port) };
                    }
                }
+                if (!Utils.IsNullOrEmpty(item.network))
+                {
+                    rule.network = Utils.String2List(item.network);
+                }
                if (item.protocol?.Count > 0)
                {
                    rule.protocol = item.protocol;
@@ -840,12 +845,14 @@ namespace v2rayN.Handler.CoreConfig
                           .ToList();
            if (lstDomain != null && lstDomain.Count > 0)
            {
+                //var strategy = dns4Sbox.servers.Where(t => !Utils.IsNullOrEmpty(t.strategy)).Select(t => t.strategy).FirstOrDefault();
                var tag = "local_local";
                dns4Sbox.servers.Add(new()
                {
                    tag = tag,
                    address = "223.5.5.5",
                    detour = Global.DirectTag,
+                    //strategy = strategy
                });
                dns4Sbox.rules.Add(new()
                {
@@ -864,7 +871,7 @@ namespace v2rayN.Handler.CoreConfig
                singboxConfig.experimental ??= new Experimental4Sbox();
                singboxConfig.experimental.clash_api = new Clash_Api4Sbox()
                {
-                    external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort}",
+                    external_controller = $"{Global.Loopback}:{LazyConfig.Instance.StatePort2}",
                };
            }

@@ -946,12 +953,14 @@ namespace v2rayN.Handler.CoreConfig
                }
                else
                {
+                    var geo = item.Split('-').FirstOrDefault() ?? geosite;
+                    var value = item.Split('-').LastOrDefault();
                    singboxConfig.route.rule_set.Add(new()
                    {
                        type = "remote",
                        format = "binary",
                        tag = item,
-                        url = string.Format(Global.SingboxRulesetUrl, item.StartsWith(geosite) ? geosite : geoip, item),
+                        url = string.Format(geo.Equals(geosite) ? Global.SingboxRulesetUrlGeosite : Global.SingboxRulesetUrlGeoip, value),
                        download_detour = Global.ProxyTag
                    });
                }
--- a/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigV2ray.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfig/CoreConfigV2ray.cs
@@ -220,39 +220,43 @@ namespace v2rayN.Handler.CoreConfig
            return 0;
        }

-        private int GenRoutingUserRule(RulesItem4Ray? rules, V2rayConfig v2rayConfig)
+        private int GenRoutingUserRule(RulesItem4Ray? rule, V2rayConfig v2rayConfig)
        {
            try
            {
-                if (rules == null)
+                if (rule == null)
                {
                    return 0;
                }
-                if (Utils.IsNullOrEmpty(rules.port))
+                if (Utils.IsNullOrEmpty(rule.port))
                {
-                    rules.port = null;
+                    rule.port = null;
                }
-                if (rules.domain?.Count == 0)
+                if (Utils.IsNullOrEmpty(rule.network))
                {
-                    rules.domain = null;
+                    rule.network = null;
                }
-                if (rules.ip?.Count == 0)
+                if (rule.domain?.Count == 0)
                {
-                    rules.ip = null;
+                    rule.domain = null;
                }
-                if (rules.protocol?.Count == 0)
+                if (rule.ip?.Count == 0)
                {
-                    rules.protocol = null;
+                    rule.ip = null;
                }
-                if (rules.inboundTag?.Count == 0)
+                if (rule.protocol?.Count == 0)
                {
-                    rules.inboundTag = null;
+                    rule.protocol = null;
+                }
+                if (rule.inboundTag?.Count == 0)
+                {
+                    rule.inboundTag = null;
                }

                var hasDomainIp = false;
-                if (rules.domain?.Count > 0)
+                if (rule.domain?.Count > 0)
                {
-                    var it = JsonUtils.DeepCopy(rules);
+                    var it = JsonUtils.DeepCopy(rule);
                    it.ip = null;
                    it.type = "field";
                    for (int k = it.domain.Count - 1; k >= 0; k--)
@@ -266,9 +270,9 @@ namespace v2rayN.Handler.CoreConfig
                    v2rayConfig.routing.rules.Add(it);
                    hasDomainIp = true;
                }
-                if (rules.ip?.Count > 0)
+                if (rule.ip?.Count > 0)
                {
-                    var it = JsonUtils.DeepCopy(rules);
+                    var it = JsonUtils.DeepCopy(rule);
                    it.domain = null;
                    it.type = "field";
                    v2rayConfig.routing.rules.Add(it);
@@ -276,12 +280,12 @@ namespace v2rayN.Handler.CoreConfig
                }
                if (!hasDomainIp)
                {
-                    if (!Utils.IsNullOrEmpty(rules.port)
-                        || rules.protocol?.Count > 0
-                        || rules.inboundTag?.Count > 0
+                    if (!Utils.IsNullOrEmpty(rule.port)
+                        || rule.protocol?.Count > 0
+                        || rule.inboundTag?.Count > 0
                        )
                    {
-                        var it = JsonUtils.DeepCopy(rules);
+                        var it = JsonUtils.DeepCopy(rule);
                        it.type = "field";
                        v2rayConfig.routing.rules.Add(it);
                    }
--- a/v2rayN/v2rayN/Handler/CoreHandler.cs
+++ b/v2rayN/v2rayN/Handler/CoreHandler.cs
@@ -57,22 +57,22 @@ namespace v2rayN.Handler
                CoreStart(node);

                //In tun mode, do a delay check and restart the core
-                if (_config.tunModeItem.enableTun)
-                {
-                    Observable.Range(1, 1)
-                    .Delay(TimeSpan.FromSeconds(15))
-                    .Subscribe(x =>
-                    {
-                        {
-                            if (_process == null || _process.HasExited)
-                            {
-                                CoreStart(node);
-                                ShowMsg(false, "Tun mode restart the core once");
-                                Logging.SaveLog("Tun mode restart the core once");
-                            }
-                        }
-                    });
-                }
+                //if (_config.tunModeItem.enableTun)
+                //{
+                //    Observable.Range(1, 1)
+                //    .Delay(TimeSpan.FromSeconds(15))
+                //    .Subscribe(x =>
+                //    {
+                //        {
+                //            if (_process == null || _process.HasExited)
+                //            {
+                //                CoreStart(node);
+                //                ShowMsg(false, "Tun mode restart the core once");
+                //                Logging.SaveLog("Tun mode restart the core once");
+                //            }
+                //        }
+                //    });
+                //}
            }
        }

@@ -186,15 +186,16 @@ namespace v2rayN.Handler
            ShowMsg(false, $"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
            ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));

-            ECoreType coreType;
-            if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
-            {
-                coreType = ECoreType.sing_box;
-            }
-            else
-            {
-                coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
-            }
+            //ECoreType coreType;
+            //if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
+            //{
+            //    coreType = ECoreType.sing_box;
+            //}
+            //else
+            //{
+            //    coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
+            //}
+            var coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
            _config.runningCoreType = coreType;
            var coreInfo = LazyConfig.Instance.GetCoreInfo(coreType);

@@ -206,13 +207,25 @@ namespace v2rayN.Handler
            }
            _process = proc;

-            //start a socks service
+            //start a pre service
            if (_process != null && !_process.HasExited)
            {
-                if ((node.configType == EConfigType.Custom && node.preSocksPort > 0))
+                ProfileItem? itemSocks = null;
+                var preCoreType = ECoreType.sing_box;
+                if (node.configType != EConfigType.Custom && coreType != ECoreType.sing_box && _config.tunModeItem.enableTun)
                {
-                    var preCoreType = _config.tunModeItem.enableTun ? ECoreType.sing_box : ECoreType.Xray;
-                    var itemSocks = new ProfileItem()
+                    itemSocks = new ProfileItem()
+                    {
+                        coreType = preCoreType,
+                        configType = EConfigType.Socks,
+                        address = Global.Loopback,
+                        port = LazyConfig.Instance.GetLocalPort(EInboundProtocol.socks)
+                    };
+                }
+                else if ((node.configType == EConfigType.Custom && node.preSocksPort > 0))
+                {
+                    preCoreType = _config.tunModeItem.enableTun ? ECoreType.sing_box : ECoreType.Xray;
+                    itemSocks = new ProfileItem()
                    {
                        coreType = preCoreType,
                        configType = EConfigType.Socks,
@@ -220,6 +233,9 @@ namespace v2rayN.Handler
                        port = node.preSocksPort
                    };
                    _config.runningCoreType = preCoreType;
+                }
+                if (itemSocks != null)
+                {
                    string fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
                    if (CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2, out string msg2, out string configStr) == 0)
                    {
--- a/v2rayN/v2rayN/Handler/LazyConfig.cs
+++ b/v2rayN/v2rayN/Handler/LazyConfig.cs
@@ -13,20 +13,26 @@ namespace v2rayN.Handler
        public static LazyConfig Instance => _instance.Value;

        private int? _statePort;
+        private int? _statePort2;

        public int StatePort
        {
            get
            {
-                if (_statePort is null)
-                {
-                    _statePort = Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
-                }
-
+                _statePort ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api));
                return _statePort.Value;
            }
        }

+        public int StatePort2
+        {
+            get
+            {
+                _statePort2 ??= Utils.GetFreePort(GetLocalPort(EInboundProtocol.api2));
+                return _statePort2.Value;
+            }
+        }
+
        private Job _processJob = new();

        public LazyConfig()
--- a/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
+++ b/v2rayN/v2rayN/Handler/StatisticsSingbox.cs
@@ -28,7 +28,7 @@ namespace v2rayN.Handler

            try
            {
-                url = $"ws://{Global.Loopback}:{LazyConfig.Instance.StatePort}/traffic";
+                url = $"ws://{Global.Loopback}:{LazyConfig.Instance.StatePort2}/traffic";

                if (webSocket == null)
                {
--- a/v2rayN/v2rayN/Models/RulesItem.cs
+++ b/v2rayN/v2rayN/Models/RulesItem.cs
@@ -4,21 +4,22 @@
    public class RulesItem
    {
        public string id { get; set; }
-        public string type { get; set; }
+        public string? type { get; set; }

-        public string port { get; set; }
+        public string? port { get; set; }
+        public string? network { get; set; }

-        public List<string> inboundTag { get; set; }
+        public List<string>? inboundTag { get; set; }

-        public string outboundTag { get; set; }
+        public string? outboundTag { get; set; }

-        public List<string> ip { get; set; }
+        public List<string>? ip { get; set; }

-        public List<string> domain { get; set; }
+        public List<string>? domain { get; set; }

-        public List<string> protocol { get; set; }
+        public List<string>? protocol { get; set; }

-        public List<string> process { get; set; }
+        public List<string>? process { get; set; }

        public bool enabled { get; set; } = true;
    }
--- a/v2rayN/v2rayN/Models/SingboxConfig.cs
+++ b/v2rayN/v2rayN/Models/SingboxConfig.cs
@@ -28,6 +28,7 @@
        public bool? disable_expire { get; set; }
        public bool? independent_cache { get; set; }
        public bool? reverse_mapping { get; set; }
+        public string? client_subnet { get; set; }
        public Fakeip4Sbox? fakeip { get; set; }
    }

@@ -44,12 +45,13 @@
        public string? outbound { get; set; }
        public string? server { get; set; }
        public bool? disable_cache { get; set; }
-        public List<string>? inbound { get; set; }
-        public List<string>? protocol { get; set; }
        public string? type { get; set; }
        public string? mode { get; set; }
-        public string? network { get; set; }
        public bool? ip_is_private { get; set; }
+        public string? client_subnet { get; set; }
+        public List<string>? inbound { get; set; }
+        public List<string>? protocol { get; set; }
+        public List<string>? network { get; set; }
        public List<int>? port { get; set; }
        public List<string>? port_range { get; set; }
        public List<string>? geosite { get; set; }
@@ -62,6 +64,7 @@
        public List<string>? source_ip_cidr { get; set; }
        public List<string>? process_name { get; set; }
        public List<string>? rule_set { get; set; }
+        public List<Rule4Sbox>? rules { get; set; }
    }

    [Serializable]
@@ -184,11 +187,13 @@

    public class Server4Sbox
    {
-        public string tag { get; set; }
-        public string address { get; set; }
-        public string address_resolver { get; set; }
-        public string strategy { get; set; }
+        public string? tag { get; set; }
+        public string? address { get; set; }
+        public string? address_resolver { get; set; }
+        public string? address_strategy { get; set; }
+        public string? strategy { get; set; }
        public string? detour { get; set; }
+        public string? client_subnet { get; set; }
    }

    public class Experimental4Sbox
--- a/v2rayN/v2rayN/Models/V2rayConfig.cs
+++ b/v2rayN/v2rayN/Models/V2rayConfig.cs
@@ -394,6 +394,7 @@ namespace v2rayN.Models
        public string? type { get; set; }

        public string? port { get; set; }
+        public string? network { get; set; }

        public List<string>? inboundTag { get; set; }

--- a/v2rayN/v2rayN/Sample/custom_routing_black
+++ b/v2rayN/v2rayN/Sample/custom_routing_black
@@ -16,7 +16,22 @@

    "domain": [
      "geosite:geolocation-!cn",
-      "geosite:greatfire"      
+      "geosite:greatfire"
+    ]
+  },
+  {
+    "outboundTag": "proxy",
+    "ip": [
+      "1.0.0.1",
+      "1.1.1.1",
+      "8.8.8.8",
+      "8.8.4.4",
+      "geoip:facebook",
+      "geoip:fastly",
+      "geoip:google",
+      "geoip:netflix",
+      "geoip:telegram",
+      "geoip:twitter"
    ]
  },
  {
--- a/v2rayN/v2rayN/Sample/custom_routing_white
+++ b/v2rayN/v2rayN/Sample/custom_routing_white
@@ -22,6 +22,10 @@
  {
    "outboundTag": "direct",
    "ip": [
+      "223.5.5.5/32",
+      "119.29.29.29/32",
+      "180.76.76.76/32",
+      "114.114.114.114/32",
      "geoip:private",
      "geoip:cn"
    ]
--- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
@@ -130,6 +130,7 @@ namespace v2rayN.ViewModels
                    id = item.id,
                    outboundTag = item.outboundTag,
                    port = item.port,
+                    network = item.network,
                    protocols = Utils.List2String(item.protocol),
                    inboundTags = Utils.List2String(item.inboundTag),
                    domains = Utils.List2String(item.domain),
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -125,16 +125,32 @@
                Margin="4"
                VerticalAlignment="Center"
                Style="{StaticResource ToolbarTextBlock}"
+                Text="network" />
+            <ComboBox
+                x:Name="cmbNetwork"
+                Grid.Row="4"
+                Grid.Column="1"
+                Width="200"
+                Margin="4"
+                MaxDropDownHeight="1000"
+                Style="{StaticResource DefComboBox}" />
+
+            <TextBlock
+                Grid.Row="5"
+                Grid.Column="0"
+                Margin="4"
+                VerticalAlignment="Center"
+                Style="{StaticResource ToolbarTextBlock}"
                Text="enabled" />
            <ToggleButton
                x:Name="togEnabled"
-                Grid.Row="4"
+                Grid.Row="5"
                Grid.Column="1"
                Margin="4"
                HorizontalAlignment="Left" />

            <TextBlock
-                Grid.Row="4"
+                Grid.Row="5"
                Grid.Column="2"
                Margin="4"
                HorizontalAlignment="Left"
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs
@@ -39,6 +39,10 @@ namespace v2rayN.Views
            {
                clbInboundTag.Items.Add(it);
            });
+            Global.RuleNetworks.ForEach(it =>
+            {
+                cmbNetwork.Items.Add(it);
+            });

            if (!rulesItem.id.IsNullOrEmpty())
            {
@@ -56,6 +60,7 @@ namespace v2rayN.Views
            {
                this.Bind(ViewModel, vm => vm.SelectedSource.outboundTag, v => v.cmbOutboundTag.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.SelectedSource.port, v => v.txtPort.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SelectedSource.network, v => v.cmbNetwork.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.SelectedSource.enabled, v => v.togEnabled.IsChecked).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.Domain, v => v.txtDomain.Text).DisposeWith(disposables);
                this.Bind(ViewModel, vm => vm.IP, v => v.txtIP.Text).DisposeWith(disposables);
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -302,7 +302,7 @@
                    </DataGrid.ContextMenu>
                    <DataGrid.Columns>
                        <DataGridTextColumn
-                            Width="120"
+                            Width="110"
                            Binding="{Binding outboundTag}"
                            Header="outboundTag" />
                        <DataGridTextColumn
@@ -310,7 +310,7 @@
                            Binding="{Binding port}"
                            Header="port" />
                        <DataGridTextColumn
-                            Width="100"
+                            Width="80"
                            Binding="{Binding protocols}"
                            Header="protocol" />
                        <DataGridTextColumn
@@ -318,11 +318,15 @@
                            Binding="{Binding inboundTags}"
                            Header="inboundTag" />
                        <DataGridTextColumn
-                            Width="220"
+                            Width="90"
+                            Binding="{Binding network}"
+                            Header="network" />
+                        <DataGridTextColumn
+                            Width="190"
                            Binding="{Binding domains}"
                            Header="domain" />
                        <DataGridTextColumn
-                            Width="220"
+                            Width="190"
                            Binding="{Binding ips}"
                            Header="ip" />
                        <DataGridTextColumn
--- a/v2rayN/v2rayN/v2rayN.csproj
+++ b/v2rayN/v2rayN/v2rayN.csproj
@@ -10,13 +10,13 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
-		<FileVersion>6.46</FileVersion>
+		<FileVersion>6.47</FileVersion>
 		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 	
 	<ItemGroup>
 		<PackageReference Include="Downloader" Version="3.0.6" />		
-		<PackageReference Include="MaterialDesignThemes" Version="5.0.0" />
+		<PackageReference Include="MaterialDesignThemes" Version="5.1.0" />
 		<PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.131" />
 		<PackageReference Include="QRCoder.Xaml" Version="1.5.1" />
 		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
Author	SHA1	Message	Date
2dust	e30c55a0af	up 6.47	2024-06-24 15:34:41 +08:00
2dust	b583590a64	Update ConfigHandler.cs https://github.com/2dust/v2rayN/pull/5264	2024-06-24 15:25:00 +08:00
OnceUponATimeInAmerica	a28c63168a	Support for setting subs-group remarks (group's name) from the (optional) "remark" query parameter in the pasted subs url (#5264 )	2024-06-24 15:20:16 +08:00
2dust	620422350f	Improved tun mode Enabling tun mode. Only one core will be run when using sing-box core; When using a non-sing-box, the sing-box will be used to start an additional front Socks service to provide a tun entry, which will then run two cores	2024-06-24 15:19:42 +08:00
2dust	b77cc3c33b	Add network attribute to route rule https://github.com/2dust/v2rayN/discussions/5256	2024-06-22 16:44:15 +08:00