From c692dd3a660d6a08f6eba22bc5e19ceb6f503a78 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 26 Apr 2023 10:00:51 +0800
Subject: [PATCH] add sing-box new LAN port

---
 v2rayN/v2rayN/Handler/CoreConfigSingbox.cs | 32 +++++++++++++++++++---
 v2rayN/v2rayN/Mode/SingboxConfig.cs        |  7 +++++
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
index 1c96da3b..e348a98b 100644
--- a/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
+++ b/v2rayN/v2rayN/Handler/CoreConfigSingbox.cs
@@ -101,6 +101,8 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        #region inbound private
+
         private int inbound(SingboxConfig singboxConfig)
         {
             try
@@ -133,16 +135,27 @@ namespace v2rayN.Handler
                     inbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
 
                     //http
-                    var inbound2 = Utils.DeepCopy(inbound);
-                    inbound2.listen_port = LazyConfig.Instance.GetLocalPort(Global.InboundHttp);
-                    inbound2.type = Global.InboundHttp;
-                    inbound2.tag = Global.InboundHttp;
+                    var inbound2 = GetInbound(inbound, Global.InboundHttp, 1, false);
                     singboxConfig.inbounds.Add(inbound2);
 
                     if (_config.inbound[0].allowLANConn)
                     {
                         if (_config.inbound[0].newPort4LAN)
                         {
+                            var inbound3 = GetInbound(inbound, Global.InboundSocks2, 2, true);
+                            inbound3.listen = "::";
+                            singboxConfig.inbounds.Add(inbound3);
+
+                            var inbound4 = GetInbound(inbound, Global.InboundHttp2, 3, false);
+                            inbound4.listen = "::";
+                            singboxConfig.inbounds.Add(inbound4);
+
+                            //auth
+                            if (!Utils.IsNullOrEmpty(_config.inbound[0].user) && !Utils.IsNullOrEmpty(_config.inbound[0].pass))
+                            {
+                                inbound3.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
+                                inbound4.users = new() { new() { username = _config.inbound[0].user, password = _config.inbound[0].pass } };
+                            }
                         }
                         else
                         {
@@ -159,6 +172,17 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        private Inbound4Sbox? GetInbound(Inbound4Sbox inItem, string tag, int offset, bool bSocks)
+        {
+            var inbound = Utils.DeepCopy(inItem);
+            inbound.tag = tag;
+            inbound.listen_port = inItem.listen_port + offset;
+            inbound.type = bSocks ? Global.InboundSocks : Global.InboundHttp;
+            return inbound;
+        }
+
+        #endregion inbound private
+
         #region outbound private
 
         private int outbound(ProfileItem node, SingboxConfig singboxConfig)
diff --git a/v2rayN/v2rayN/Mode/SingboxConfig.cs b/v2rayN/v2rayN/Mode/SingboxConfig.cs
index 1afcf0d6..a873fb2c 100644
--- a/v2rayN/v2rayN/Mode/SingboxConfig.cs
+++ b/v2rayN/v2rayN/Mode/SingboxConfig.cs
@@ -73,6 +73,13 @@
         public string? stack { get; set; }
         public bool? sniff { get; set; }
         public bool? sniff_override_destination { get; set; }
+        public List<User4Sbox> users { get; set; }
+    }
+
+    public class User4Sbox
+    {
+        public string username { get; set; }
+        public string password { get; set; }
     }
 
     public class Outbound4Sbox