From 6340764a6c3838b1be89ca692d7f4b2d1f0d0e98 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 24 Apr 2023 09:40:38 +0800
Subject: [PATCH] Add basic rules for sing-box

---
 v2rayN/v2rayN/Base/HttpClientHelper.cs     |  1 -
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs | 25 +++++++++++++++++-----
 v2rayN/v2rayN/Handler/ShareHandler.cs      |  4 ----
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/v2rayN/v2rayN/Base/HttpClientHelper.cs b/v2rayN/v2rayN/Base/HttpClientHelper.cs
index e2ede74b..72d9d3c6 100644
--- a/v2rayN/v2rayN/Base/HttpClientHelper.cs
+++ b/v2rayN/v2rayN/Base/HttpClientHelper.cs
@@ -136,7 +136,6 @@ namespace v2rayN.Base
                     var data = new byte[read];
                     buffer.ToList().CopyTo(0, data, 0, read);
 
-                    // TODO:
                     totalRead += read;
 
                     TimeSpan ts = (DateTime.Now - totalDatetime);
diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index 177c6a3e..08a5a7ea 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -326,13 +326,28 @@ namespace v2rayN.Handler
         {
             try
             {
-                var routing = ConfigHandler.GetDefaultRouting(ref _config);
-                if (routing != null)
+                if (_config.routingBasicItem.enableRoutingAdvanced)
                 {
-                    var rules = Utils.FromJson<List<RulesItem>>(routing.ruleSet);
-                    foreach (var item in rules!)
+                    var routing = ConfigHandler.GetDefaultRouting(ref _config);
+                    if (routing != null)
                     {
-                        if (item.enabled)
+                        var rules = Utils.FromJson<List<RulesItem>>(routing.ruleSet);
+                        foreach (var item in rules!)
+                        {
+                            if (item.enabled)
+                            {
+                                routingUserRule(item, singboxConfig.route.rules);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    var lockedItem = ConfigHandler.GetLockedRoutingItem(ref _config);
+                    if (lockedItem != null)
+                    {
+                        var rules = Utils.FromJson<List<RulesItem>>(lockedItem.ruleSet);
+                        foreach (var item in rules!)
                         {
                             routingUserRule(item, singboxConfig.route.rules);
                         }
diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index 03919439..fb2ca498 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -484,7 +484,6 @@ namespace v2rayN.Handler
             switch (i.streamSecurity)
             {
                 case "tls":
-                    // TODO tls config
                     break;
 
                 default:
@@ -499,13 +498,10 @@ namespace v2rayN.Handler
                 case "tcp":
                     string t1 = q["type"] ?? "none";
                     i.headerType = t1;
-                    // TODO http option
-
                     break;
 
                 case "kcp":
                     i.headerType = q["type"] ?? "none";
-                    // TODO kcp seed
                     break;
 
                 case "ws":