standard2支持

NoSugarNet.Adapter/DataHelper/CompressAdapterSelector.cs

@@ -0,0 +1,18 @@
+using NoSugarNet.Adapter.DataHelper;
+
+namespace NoSugarNet.Adapter.DataHelper
+{
+    public static class CompressAdapterSelector
+    {
+        static Dictionary<E_CompressAdapter, CompressAdapter> mDictAdapter = new Dictionary<E_CompressAdapter, CompressAdapter>();
+
+        public static CompressAdapter Adapter(E_CompressAdapter adptType)
+        {
+            if(mDictAdapter.ContainsKey(adptType))
+                return mDictAdapter[adptType];
+
+            mDictAdapter[adptType] = new CompressAdapter(adptType);
+            return mDictAdapter[adptType];
+        }
+    }
+}

NoSugarNet.Adapter/ForwardLocalListener.cs

@@ -10,6 +10,7 @@ namespace NoSugarNet.Adapter
         public long mReciveAllLenght;
         public long mSendAllLenght;
         public long currSeed;
+        public long mUid;
         static long Seed;
 
         public enum AdptLogLevel
@@ -21,16 +22,16 @@ namespace NoSugarNet.Adapter
         }
 
         public delegate void OnLogOutHandler(int LogLevel,string Msg);
-        public delegate void OnClientLocalConnectHandler(byte tunnelId, byte _Idx);
+        public delegate void OnClientLocalConnectHandler(long UID, byte tunnelId, byte _Idx);
-        public delegate void OnClientLocalDisconnectHandler(byte tunnelId, byte _Idx);
+        public delegate void OnClientLocalDisconnectHandler(long UID, byte tunnelId, byte _Idx);
-        public delegate void OnClientTunnelDataCallBackHandler(byte tunnelId, byte Idx, byte[] data);
+        public delegate void OnClientTunnelDataCallBackHandler(long UID, byte tunnelId, byte Idx, byte[] data);
 
         public event OnLogOutHandler OnForwardLogOut;
         public event OnClientLocalConnectHandler OnClientLocalConnect;
         public event OnClientLocalDisconnectHandler OnClientLocalDisconnect;
         public event OnClientTunnelDataCallBackHandler OnClientTunnelDataCallBack;
 
-        public ForwardLocalListener(int numConnections, int receiveBufferSize, byte TunnelID)
+        public ForwardLocalListener(int numConnections, int receiveBufferSize, byte TunnelID, long mUid)
             : base(numConnections, receiveBufferSize)
         {
             OnClientNumberChange += ClientNumberChange;
@@ -41,6 +42,7 @@ namespace NoSugarNet.Adapter
             mTunnelID = TunnelID;
 
             currSeed = Seed++;
+            this.mUid = mUid;
         }
 
 
@@ -75,7 +77,7 @@ namespace NoSugarNet.Adapter
                 int Idx = AddDictSocket(token.Socket);
                 if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInf))
                 {
-                    OnClientLocalConnect?.Invoke(mTunnelID, (byte)Idx);
+                    OnClientLocalConnect?.Invoke(mUid, mTunnelID, (byte)Idx);
                 }
             }
         }
@@ -116,7 +118,7 @@ namespace NoSugarNet.Adapter
             try
             {
                 //抛出网络数据
-                OnClientTunnelDataCallBack?.Invoke(mTunnelID, (byte)Idx, data);
+                OnClientTunnelDataCallBack?.Invoke(mUid, mTunnelID, (byte)Idx, data);
             }
             catch (Exception ex)
             {
@@ -132,7 +134,7 @@ namespace NoSugarNet.Adapter
                 while (_localClientInfo.msgQueue.Count > 0)
                 {
                     IdxWithMsg msg = _localClientInfo.msgQueue.Dequeue();
-                    LocalMsgQueuePool._localMsgPool.Enqueue(msg);
+                    MsgQueuePool._MsgPool.Enqueue(msg);
                 }
 
                 _localClientInfo._socket.Shutdown(SocketShutdown.Both);
@@ -150,7 +152,7 @@ namespace NoSugarNet.Adapter
             if (!GetSocketIdxBySocket(token.Socket, out int Idx))
                 return;
 
-            OnClientLocalDisconnect?.Invoke(mTunnelID, (byte)Idx);
+            OnClientLocalDisconnect?.Invoke(mUid, mTunnelID, (byte)Idx);
             RemoveDictSocket(token.Socket);
         }
 
@@ -312,7 +314,7 @@ namespace NoSugarNet.Adapter
             if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
                 return;
 
-            IdxWithMsg Msg = LocalMsgQueuePool._localMsgPool.Dequeue();
+            IdxWithMsg Msg = MsgQueuePool._MsgPool.Dequeue();
             Msg.Idx = Idx;
             Msg.data = data;
             _localClientInfo.msgQueue.Enqueue(Msg);

NoSugarNet.Adapter/LocalMsgQueuePool.cs

@@ -6,13 +6,13 @@
         public byte[] data;
     }
 
-    public class LocalMsgQueuePool
+    public class MsgQueuePool
     {
-        public static LocalMsgQueuePool _localMsgPool = new LocalMsgQueuePool(1000);
+        public static MsgQueuePool _MsgPool = new MsgQueuePool(1000);
 
         Queue<IdxWithMsg> msg_pool;
 
-        public LocalMsgQueuePool(int capacity)
+        public MsgQueuePool(int capacity)
         {
             msg_pool = new Queue<IdxWithMsg>(capacity);
         }

NoSugarNet.Adapter/NoSugarNet.Adapter.csproj.user

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_LastSelectedProfileId>F:\Sin365\NoSugarNet\NoSugarNet.Adapter\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+  </PropertyGroup>
+</Project>

NoSugarNet.ClientCli.Standard2/Config.cs

@@ -0,0 +1,73 @@
+using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.Unicode;
+
+namespace NoSugarNet.ClientCli
+{
+
+    public class ConfigDataModel
+    {
+        public string ServerIP { get; set; }
+        public int ServerPort { get; set; }
+        public int CompressAdapterType { get; set; }
+        public List<ConfigDataModel_Single> TunnelList { get; set; }
+    }
+
+    public class ConfigDataModel_Single
+    {
+        public string LocalTargetIP { get; set; }
+        public int LocalTargetPort { get; set; }
+        public int RemoteLocalPort { get; set; }
+    }
+
+    public static class Config
+    {
+        public static ConfigDataModel cfg;
+        public static bool LoadConfig()
+        {
+            try
+            {
+                string path = System.Environment.CurrentDirectory + "//config.cfg";
+                if (!File.Exists(path))
+                {
+                    ConfigDataModel sampleCfg = new ConfigDataModel
+                    {
+                        ServerIP = "127.0.0.1",
+                        ServerPort = 1000,
+                        TunnelList = new List<ConfigDataModel_Single>()
+                        {
+                            new ConfigDataModel_Single(){ LocalTargetIP = "127.0.0.1",LocalTargetPort=3389,RemoteLocalPort = 20001},
+                            new ConfigDataModel_Single(){ LocalTargetIP = "127.0.0.1",LocalTargetPort=3389,RemoteLocalPort = 20002}
+                        }
+                    };
+
+                    string jsonString = JsonSerializer.Serialize(sampleCfg, new JsonSerializerOptions()
+                    {
+                        // 整齐打印
+                        WriteIndented = true,
+                        //重新编码，解决中文乱码问题
+                        Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
+                    });
+                    System.IO.File.WriteAllText(path, jsonString, Encoding.UTF8);
+
+                    Console.WriteLine("未找到配置，已生成模板，请浏览" + path);
+                    return false;
+                }
+                StreamReader sr = new StreamReader(path, Encoding.Default);
+                String jsonstr = sr.ReadToEnd();
+                cfg = JsonSerializer.Deserialize<ConfigDataModel>(jsonstr);
+                sr.Close();
+                if (cfg?.TunnelList.Count > 0)
+                    return true;
+                else
+                    return false;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("配置文件异常：" + ex.ToString());
+                return false;
+            }
+        }
+    }
+}

NoSugarNet.ClientCli.Standard2/NoSugarNet.ClientCli.Standard2.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\NoSugarNet.ClientCore.Standard2\NoSugarNet.ClientCore.Standard2.csproj" />
+  </ItemGroup>
+
+</Project>

NoSugarNet.ClientCli.Standard2/Program.cs

@@ -0,0 +1,77 @@
+using NoSugarNet.ClientCore;
+using NoSugarNet.ClientCore.Common;
+
+namespace NoSugarNet.ClientCli.Standard2
+{
+    internal class Program
+    {
+        static string Title = "NoSugarNetClient";
+        static void Main(string[] args)
+        {
+            if (!Config.LoadConfig())
+            {
+                Console.WriteLine("配置文件错误");
+                Console.ReadLine();
+                return;
+            }
+
+            AppNoSugarNet.OnUpdateStatus += OnUpdateStatus;
+
+            Dictionary<byte, TunnelClientData> dictTunnel = new Dictionary<byte, TunnelClientData>();
+            for (int i = 0; i < Config.cfg.TunnelList.Count; i++)
+            {
+                ConfigDataModel_Single cfgSingle = Config.cfg.TunnelList[i];
+                dictTunnel[(byte)i] = new TunnelClientData()
+                {
+                    TunnelId = (byte)i,
+                    LocalTargetIP = cfgSingle.LocalTargetIP,
+                    LocalTargetPort = (ushort)cfgSingle.LocalTargetPort,
+                    RemoteLocalPort = (ushort)cfgSingle.RemoteLocalPort,
+                };
+            }
+
+            AppNoSugarNet.Init(dictTunnel, Config.cfg.CompressAdapterType, OnNoSugarNetLog);
+            AppNoSugarNet.Connect(Config.cfg.ServerIP, Config.cfg.ServerPort);
+            while (true)
+            {
+                string CommandStr = Console.ReadLine();
+                string Command = "";
+                Command = ((CommandStr.IndexOf(" ") <= 0) ? CommandStr : CommandStr.Substring(0, CommandStr.IndexOf(" ")));
+                string[] CmdArr = CommandStr.Split(' ');
+                switch (Command)
+                {
+                    case "con":
+                        AppNoSugarNet.Connect(Config.cfg.ServerIP, Config.cfg.ServerPort);
+                        break;
+                    case "tlist":
+                        AppNoSugarNet.forwardlocal.GetClientCount(out int ClientUserCount, out int TunnelCount);
+                        Console.WriteLine($"GetClientCount->{ClientUserCount} TunnelCount->{TunnelCount}");
+
+                        AppNoSugarNet.forwardlocal.GetClientDebugInfo();
+                        break;
+                    case "stop":
+                        AppNoSugarNet.Close();
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+        static void OnUpdateStatus(NetStatus Forward_NetStatus, NetStatus Reverse_NetStatus)
+        {
+            string info = $"Forward: t:{Forward_NetStatus.TunnelCount} r:{ConvertBytesToKilobytes(Forward_NetStatus.srcReciveSecSpeed)}K/s|{ConvertBytesToKilobytes(Forward_NetStatus.tReciveSecSpeed)}K/s s: {ConvertBytesToKilobytes(Forward_NetStatus.srcSendSecSpeed)}K/s|{ConvertBytesToKilobytes(Forward_NetStatus.tSendSecSpeed)}K/s" +
+                $"| Reverse t:{Reverse_NetStatus.TunnelCount} r:{ConvertBytesToKilobytes(Reverse_NetStatus.srcReciveSecSpeed)}K/s|{ConvertBytesToKilobytes(Reverse_NetStatus.tReciveSecSpeed)}K/s s: {ConvertBytesToKilobytes(Reverse_NetStatus.srcSendSecSpeed)}K/s|{ConvertBytesToKilobytes(Reverse_NetStatus.tSendSecSpeed)}K/s";
+            Console.Title = Title + info;
+            Console.WriteLine(info);
+        }
+        static string ConvertBytesToKilobytes(long bytes)
+        {
+            return Math.Round((double)bytes / 1024, 2).ToString("F2");
+        }
+        static void OnNoSugarNetLog(int LogLevel, string msg)
+        {
+            Console.WriteLine(msg);
+        }
+
+    }
+}

NoSugarNet.ClientCore.Standard2/AppNoSugarNet.cs

@@ -1,9 +1,12 @@
-using NoSugarNet.ClientCoreNet.Standard2.Manager;
+using NoSugarNet.Adapter.DataHelper;
-using NoSugarNet.ClientCoreNet.Standard2.Network;
+using NoSugarNet.ClientCore.Common;
+using NoSugarNet.ClientCore.Manager;
+using NoSugarNet.ClientCore.Network;
 using ServerCore.Manager;
-using static NoSugarNet.ClientCoreNet.Standard2.Manager.LogManager;
+using System.Collections.Generic;
+using static NoSugarNet.ClientCore.Manager.LogManager;
 
-namespace NoSugarNet.ClientCoreNet.Standard2
+namespace NoSugarNet.ClientCore
 {
     public class AppNoSugarNet
     {
@@ -15,28 +18,35 @@ namespace NoSugarNet.ClientCoreNet.Standard2
         public static NetworkHelper networkHelper;
         public static AppLogin login;
         public static AppChat chat;
-        public static AppLocalClient local;
+        public static AppForwardLocalClient forwardlocal;
+        public static AppReverseLocalClient reverselocal;
         public static UserDataManager user;
         public static System.Timers.Timer _SpeedCheckTimeTimer;//速度检测计时器
         public static int TimerInterval = 1000;//计时器间隔
-        static NetStatus netStatus;
+        static NetStatus Forward_NetStatus;
+        static NetStatus Reverse_NetStatus;
 
         #region 委托和事件
-        public delegate void OnUpdateStatusHandler(NetStatus Status);
+        public delegate void OnUpdateStatusHandler(NetStatus ForwardStatus, NetStatus ReverseStatus);
         public static event OnUpdateStatusHandler OnUpdateStatus;
         #endregion
 
-        public static void Init(OnLogHandler onLog = null)
+        public static void Init(Dictionary<byte, TunnelClientData> cfgs, int compressAdapterType = 0,OnLogHandler onLog = null)
         {
+            Config.cfgs = cfgs;
+            Config.compressAdapterType = (E_CompressAdapter)compressAdapterType;
+
             log = new LogManager();
             if(onLog != null)
                 LogManager.OnLog += onLog;
             networkHelper = new NetworkHelper();
             login = new AppLogin();
             chat = new AppChat();
-            local = new AppLocalClient();
+            forwardlocal = new AppForwardLocalClient();
+            reverselocal = new AppReverseLocalClient(Config.compressAdapterType);
             user = new UserDataManager();
-            netStatus = new NetStatus();
+            Forward_NetStatus = new NetStatus();
+            Reverse_NetStatus = new NetStatus();
             _SpeedCheckTimeTimer = new System.Timers.Timer();
             _SpeedCheckTimeTimer.Interval = TimerInterval;
             _SpeedCheckTimeTimer.Elapsed += Checktimer_Elapsed;
@@ -53,7 +63,7 @@ namespace NoSugarNet.ClientCoreNet.Standard2
 
         public static void Close()
         {
-            local.StopAll();
+            forwardlocal.StopAll();
             networkHelper.CloseConntect();
             AppNoSugarNet.log.Info("停止");
             _SpeedCheckTimeTimer.Enabled = false;
@@ -61,24 +71,45 @@ namespace NoSugarNet.ClientCoreNet.Standard2
 
         static void Checktimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
-            local.GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght);
-            local.GetClientCount(out int ClientUserCount, out int TunnelCount);
-
-            NetStatus resutnetStatus = new NetStatus()
             {
-                TunnelCount = TunnelCount,
+                forwardlocal.GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght);
-                ClientUserCount = ClientUserCount,
+                forwardlocal.GetClientCount(out int ClientUserCount, out int TunnelCount);
-                srcSendAllLenght = resultSendAllLenght,
+                NetStatus resutnetStatus = new NetStatus()
-                srcReciveAllLenght = resultReciveAllLenght,
+                {
-                srcReciveSecSpeed = (resultReciveAllLenght - netStatus.srcReciveAllLenght) / (TimerInterval / 1000),
+                    TunnelCount = TunnelCount,
-                srcSendSecSpeed = (resultSendAllLenght - netStatus.srcSendAllLenght) / (TimerInterval / 1000),
+                    ClientUserCount = ClientUserCount,
-                tSendAllLenght = local.tSendAllLenght,
+                    srcSendAllLenght = resultSendAllLenght,
-                tReciveAllLenght = local.tReciveAllLenght,
+                    srcReciveAllLenght = resultReciveAllLenght,
-                tSendSecSpeed = (local.tSendAllLenght - netStatus.tSendAllLenght) / (TimerInterval / 1000),
+                    srcReciveSecSpeed = (resultReciveAllLenght - Forward_NetStatus.srcReciveAllLenght) / (TimerInterval / 1000),
-                tReciveSecSpeed = (local.tReciveAllLenght - netStatus.tReciveAllLenght) / (TimerInterval / 1000),
+                    srcSendSecSpeed = (resultSendAllLenght - Forward_NetStatus.srcSendAllLenght) / (TimerInterval / 1000),
-            };
+                    tSendAllLenght = forwardlocal.tSendAllLenght,
-            netStatus = resutnetStatus;
+                    tReciveAllLenght = forwardlocal.tReciveAllLenght,
-            OnUpdateStatus?.Invoke(resutnetStatus);
+                    tSendSecSpeed = (forwardlocal.tSendAllLenght - Forward_NetStatus.tSendAllLenght) / (TimerInterval / 1000),
+                    tReciveSecSpeed = (forwardlocal.tReciveAllLenght - Forward_NetStatus.tReciveAllLenght) / (TimerInterval / 1000),
+                };
+                Forward_NetStatus = resutnetStatus;
+            }
+
+            {
+                reverselocal.GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght);
+                reverselocal.GetClientCount(out int ClientUserCount, out int TunnelCount);
+                NetStatus resutnetStatus = new NetStatus()
+                {
+                    TunnelCount = TunnelCount,
+                    ClientUserCount = ClientUserCount,
+                    srcSendAllLenght = resultSendAllLenght,
+                    srcReciveAllLenght = resultReciveAllLenght,
+                    srcReciveSecSpeed = (resultReciveAllLenght - Reverse_NetStatus.srcReciveAllLenght) / (TimerInterval / 1000),
+                    srcSendSecSpeed = (resultSendAllLenght - Reverse_NetStatus.srcSendAllLenght) / (TimerInterval / 1000),
+                    tSendAllLenght = reverselocal.tSendAllLenght,
+                    tReciveAllLenght = reverselocal.tReciveAllLenght,
+                    tSendSecSpeed = (reverselocal.tSendAllLenght - Reverse_NetStatus.tSendAllLenght) / (TimerInterval / 1000),
+                    tReciveSecSpeed = (reverselocal.tReciveAllLenght - Reverse_NetStatus.tReciveAllLenght) / (TimerInterval / 1000),
+                };
+                Reverse_NetStatus = resutnetStatus;
+            }
+
+            OnUpdateStatus?.Invoke(Forward_NetStatus , Reverse_NetStatus);
         }
     }
 }

NoSugarNet.ClientCore.Standard2/Common/Config.cs

@@ -0,0 +1,18 @@
+using NoSugarNet.Adapter.DataHelper;
+using System.Collections.Generic;
+
+namespace NoSugarNet.ClientCore.Common
+{
+    public struct TunnelClientData
+    {
+        public byte TunnelId;
+        public string LocalTargetIP;
+        public ushort LocalTargetPort;
+        public ushort RemoteLocalPort;
+    }
+    public static class Config
+    {
+        public static Dictionary<byte, TunnelClientData> cfgs = new Dictionary<byte, TunnelClientData>();
+        public static E_CompressAdapter compressAdapterType;
+    }
+}

NoSugarNet.ClientCore.Standard2/Common/Helper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NoSugarNet.ClientCoreNet.Standard2.Common
+namespace NoSugarNet.ClientCore.Common
 {
     public static class Helper
     {

NoSugarNet.ClientCore.Standard2/Common/ProtoBufHelper.cs

@@ -1,7 +1,7 @@
 using Google.Protobuf;
 using System;
 
-namespace NoSugarNet.ClientCoreNet.Standard2.Common
+namespace NoSugarNet.ClientCore.Common
 {
     public static class ProtoBufHelper
     {

NoSugarNet.ClientCore.Standard2/Event/EEvent.cs

@@ -1,4 +1,4 @@
-namespace NoSugarNet.ClientCoreNet.Standard2.Event
+namespace NoSugarNet.ClientCore.Event
 {
     public enum EEvent
     {

NoSugarNet.ClientCore.Standard2/Event/EventSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NoSugarNet.ClientCoreNet.Standard2.Event
+namespace NoSugarNet.ClientCore.Event
 {
     public class EventData
     {

NoSugarNet.ClientCore.Standard2/Manager/AppChat.cs

@@ -1,9 +1,9 @@
 using AxibugProtobuf;
-using NoSugarNet.ClientCoreNet.Standard2.Common;
+using NoSugarNet.ClientCore.Common;
-using NoSugarNet.ClientCoreNet.Standard2.Event;
+using NoSugarNet.ClientCore.Event;
-using NoSugarNet.ClientCoreNet.Standard2.Network;
+using NoSugarNet.ClientCore.Network;
 
-namespace NoSugarNet.ClientCoreNet.Standard2.Manager
+namespace NoSugarNet.ClientCore.Manager
 {
     public class AppChat
     {

NoSugarNet.ClientCore.Standard2/Manager/AppForwardLocalClient.cs

@@ -1,34 +1,32 @@
 using AxibugProtobuf;
 using Google.Protobuf;
-using NoSugarNet.ClientCoreNet.Standard2;
+using NoSugarNet.Adapter;
-using NoSugarNet.ClientCoreNet.Standard2.Common;
+using NoSugarNet.Adapter.DataHelper;
-using NoSugarNet.ClientCoreNet.Standard2.Network;
+using NoSugarNet.ClientCore;
-using NoSugarNet.DataHelper;
+using NoSugarNet.ClientCore.Common;
+using NoSugarNet.ClientCore.Network;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 
 namespace ServerCore.Manager
 {
-    public class AppLocalClient
+    public class AppForwardLocalClient
     {
         Dictionary<byte, Protobuf_Cfgs_Single> mDictTunnelID2Cfg = new Dictionary<byte, Protobuf_Cfgs_Single>();
-        Dictionary<byte, LocalListener> mDictTunnelID2Listeners = new Dictionary<byte, LocalListener>();
+        Dictionary<byte, ForwardLocalListener> mDictTunnelID2Listeners = new Dictionary<byte, ForwardLocalListener>();
-        CompressAdapter mCompressAdapter;
+        NoSugarNet.Adapter.DataHelper.E_CompressAdapter compressAdapterType;
-        E_CompressAdapter compressAdapterType;
-        public LocalMsgQueuePool _localMsgPool = new LocalMsgQueuePool(1000);
 
         public long tReciveAllLenght { get; private set; }
         public long tSendAllLenght { get; private set; }
 
-        public AppLocalClient()
+        public AppForwardLocalClient()
         {
             //注册网络消息
-            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdCfgs, Recive_CmdCfgs);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdServerCfgs, Recive_CmdCfgs);
-            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CConnect, Recive_TunnelS2CConnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CForwardConnect, Recive_TunnelS2CConnect);
-            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CDisconnect, Recive_TunnelS2CDisconnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CForwardDisconnect, Recive_TunnelS2CDisconnect);
-            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CData, Recive_TunnelS2CData);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CForwardData, Recive_TunnelS2CData);
         }
 
         public void GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght)
@@ -51,20 +49,40 @@ namespace ServerCore.Manager
             ClientUserCount = mDictTunnelID2Listeners.Count;
         }
 
+        public void GetClientDebugInfo()
+        {
+            AppNoSugarNet.log.Debug($"------------ mDictTunnelID2Listeners {mDictTunnelID2Listeners.Count} ------------");
+            lock (mDictTunnelID2Listeners)
+            {
+                foreach (var item in mDictTunnelID2Listeners)
+                {
+                    var cinfo = item.Value.GetDictIdx2LocalClientInfo();
+                    AppNoSugarNet.log.Debug($"----- TunnelID {item.Key} ObjcurrSeed->{item.Value.currSeed} ClientList->{item.Value.ClientList.Count} Idx2LocalClient->{cinfo.Count} -----");
+                    
+                    foreach (var c in cinfo)
+                    {
+                        AppNoSugarNet.log.Debug($"----- Idx {c.Key} bRemoteConnect->{c.Value.bRemoteConnect} msgQueue.Count->{c.Value.msgQueue.Count} -----");
+                    }
+                }
+            }
+        }
+
         /// <summary>
         /// 初始化连接，先获取到配置
         /// </summary>
         void InitListenerMode()
         {
             AppNoSugarNet.log.Info("初始化压缩适配器" + compressAdapterType);
-            //初始化压缩适配器，代表压缩类型
+            ////初始化压缩适配器，代表压缩类型
-            mCompressAdapter = new CompressAdapter(compressAdapterType);
+            //mCompressAdapter = new NoSugarNet.Adapter.DataHelper.CompressAdapter(compressAdapterType);
             foreach (var cfg in mDictTunnelID2Cfg)
             {
-                LocalListener listener = new LocalListener(256, 1024, cfg.Key);
+                ForwardLocalListener listener = new ForwardLocalListener(256, 1024, cfg.Key,AppNoSugarNet.user.userdata.UID);
                 AppNoSugarNet.log.Info($"开始监听配置 Tunnel:{cfg.Key},Port:{cfg.Value.Port}");
-                listener.Init();
+                listener.BandEvent(AppNoSugarNet.log.Log, OnClientLocalConnect, OnClientLocalDisconnect, OnClientTunnelDataCallBack);
-                listener.Start(new IPEndPoint(IPAddress.Any.Address, (int)cfg.Value.Port));
+                listener.StartListener((uint)cfg.Value.Port);
+                //listener.Init();
+                //listener.Start(new IPEndPoint(IPAddress.Any.Address, (int)cfg.Value.Port));
                 //listener.Init((int)cfg.Value.Port);
                 AddLocalListener(listener);
             }
@@ -77,7 +95,7 @@ namespace ServerCore.Manager
         /// </summary>
         /// <param name="tunnelId"></param>
         /// <param name="serverClient"></param>
-        void AddLocalListener(LocalListener _listener)
+        void AddLocalListener(ForwardLocalListener _listener)
         {
             lock (mDictTunnelID2Listeners)
             {
@@ -89,7 +107,7 @@ namespace ServerCore.Manager
         /// </summary>
         /// <param name="tunnelId"></param>
         /// <param name="serverClient"></param>
-        void RemoveLocalListener(LocalListener _listener)
+        void RemoveLocalListener(ForwardLocalListener _listener)
         {
             lock (mDictTunnelID2Listeners)
             {
@@ -99,7 +117,7 @@ namespace ServerCore.Manager
                 }
             }
         }
-        bool GetLocalListener(byte tunnelId,out LocalListener _listener)
+        bool GetLocalListener(byte tunnelId,out ForwardLocalListener _listener)
         {
             _listener = null;
             if (!mDictTunnelID2Listeners.ContainsKey(tunnelId))
@@ -115,11 +133,13 @@ namespace ServerCore.Manager
                 byte[] keys = mDictTunnelID2Listeners.Keys.ToArray();
                 for (int i = 0; i < keys.Length; i++) 
                 {
-                    LocalListener _listener = mDictTunnelID2Listeners[keys[i]];
+                    ForwardLocalListener _listener = mDictTunnelID2Listeners[keys[i]];
-                    _listener.StopAll();
+                    _listener.StopAllLocalClient();
+                    _listener.StopWithClear();
                     //_listener.Stop();
                     RemoveLocalListener(_listener);
                 }
+                mDictTunnelID2Listeners.Clear();
             }
         }
         #endregion
@@ -127,7 +147,7 @@ namespace ServerCore.Manager
         #region 解析服务端下行数据
         public void Recive_CmdCfgs(byte[] reqData)
         {
-            AppNoSugarNet.log.Debug("Recive_CmdCfgs");
+            AppNoSugarNet.log.Debug("Forward->Recive_CmdCfgs");
             Protobuf_Cfgs msg = ProtoBufHelper.DeSerizlize<Protobuf_Cfgs>(reqData);
 
             for (int i = 0;i < msg.Cfgs.Count;i++) 
@@ -135,29 +155,28 @@ namespace ServerCore.Manager
                 Protobuf_Cfgs_Single cfg = msg.Cfgs[i];
                 mDictTunnelID2Cfg[(byte)cfg.TunnelID] = cfg;
             }
-            compressAdapterType = (E_CompressAdapter)msg.CompressAdapterType;
+            compressAdapterType = (NoSugarNet.Adapter.DataHelper.E_CompressAdapter)msg.CompressAdapterType;
             InitListenerMode();
         }
         public void Recive_TunnelS2CConnect(byte[] reqData)
         {
-            AppNoSugarNet.log.Debug("Recive_TunnelS2CConnect");
+            AppNoSugarNet.log.Debug("Forward->Recive_TunnelS2CConnect");
-            Protobuf_S2C_Connect msg = ProtoBufHelper.DeSerizlize<Protobuf_S2C_Connect>(reqData);
+            Protobuf_Tunnel_Connect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Connect>(reqData);
             if(msg.Connected == 1)
-                OnServerLocalConnect((byte)msg.TunnelID,(byte)msg.Idx);
+                OnRemoteLocalConnect((byte)msg.TunnelID,(byte)msg.Idx);
             else
-                OnServerLocalDisconnect((byte)msg.TunnelID, (byte)msg.Idx);
+                OnRemoteLocalDisconnect((byte)msg.TunnelID, (byte)msg.Idx);
         }
         public void Recive_TunnelS2CDisconnect(byte[] reqData)
         {
-            AppNoSugarNet.log.Debug("Recive_TunnelS2CDisconnect");
+            AppNoSugarNet.log.Debug("Forward->Recive_TunnelS2CDisconnect");
-            Protobuf_S2C_Disconnect msg = ProtoBufHelper.DeSerizlize<Protobuf_S2C_Disconnect>(reqData);
+            Protobuf_Tunnel_Disconnect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Disconnect>(reqData);
-            OnServerLocalDisconnect((byte)msg.TunnelID,(byte)msg.Idx);
+            OnRemoteLocalDisconnect((byte)msg.TunnelID,(byte)msg.Idx);
         }
         public void Recive_TunnelS2CData(byte[] reqData)
         {
-            //AppNoSugarNet.log.Debug("Recive_TunnelS2CData");
+            Protobuf_Tunnel_DATA msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_DATA>(reqData);
-            Protobuf_S2C_DATA msg = ProtoBufHelper.DeSerizlize<Protobuf_S2C_DATA>(reqData);
+            OnRemoteLocalDataCallBack((byte)msg.TunnelID,(byte)msg.Idx, msg.HunterNetCoreData.ToArray());
-            OnServerLocalDataCallBack((byte)msg.TunnelID,(byte)msg.Idx, msg.HunterNetCoreData.ToArray());
         }
         #endregion
 
@@ -167,51 +186,51 @@ namespace ServerCore.Manager
         /// </summary>
         /// <param name="uid"></param>
         /// <param name="tunnelId"></param>
-        public void OnClientLocalConnect(byte tunnelId,byte _Idx)
+        public void OnClientLocalConnect(long UID, byte tunnelId,byte _Idx)
         {
-            AppNoSugarNet.log.Debug($"OnClientLocalConnect {tunnelId},{_Idx}");
+            AppNoSugarNet.log.Debug($"Forward->OnClientLocalConnect {tunnelId},{_Idx}");
             if (!mDictTunnelID2Cfg.ContainsKey(tunnelId))
                 return;
 
-            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_C2S_Connect()
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Connect()
             {
                 TunnelID = tunnelId,
                 Idx = _Idx,
             });
             
             //告知给服务端，来自客户端本地的连接建立
-            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SConnect, respData);
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SForwardConnect, respData);
         }
         /// <summary>
         /// 当客户端本地端口连接断开
         /// </summary>
         /// <param name="uid"></param>
         /// <param name="tunnelId"></param>
-        public void OnClientLocalDisconnect(byte tunnelId, byte _Idx)
+        public void OnClientLocalDisconnect(long UID, byte tunnelId, byte _Idx)
         {
-            AppNoSugarNet.log.Debug($"OnClientLocalDisconnect {tunnelId},{_Idx}");
+            AppNoSugarNet.log.Debug($"Forward->OnClientLocalDisconnect {tunnelId},{_Idx}");
             //隧道ID定位投递服务端本地连接
             if (!mDictTunnelID2Cfg.ContainsKey(tunnelId))
                 return;
 
-            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_C2S_Disconnect()
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Disconnect()
             {
                 TunnelID = tunnelId,
                 Idx= _Idx,
             });
 
             //告知给服务端，来自客户端本地的连接断开
-            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SDisconnect, respData);
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SForwardDisconnect, respData);
         }
 
         /// <summary>
         /// 当服务端本地端口连接
         /// </summary>
         /// <param name="tunnelId"></param>
-        public void OnServerLocalConnect(byte tunnelId,byte Idx)
+        public void OnRemoteLocalConnect(byte tunnelId,byte Idx)
         {
-            AppNoSugarNet.log.Debug($"OnServerLocalConnect {tunnelId},{Idx}");
+            AppNoSugarNet.log.Debug($"Forward->OnRemoteLocalConnect {tunnelId},{Idx}");
-            if (!GetLocalListener(tunnelId, out LocalListener _listener))
+            if (!GetLocalListener(tunnelId, out ForwardLocalListener _listener))
                 return;
             //维护状态
             _listener.SetRemoteConnectd(Idx, true);
@@ -221,9 +240,9 @@ namespace ServerCore.Manager
                 {
                     IdxWithMsg msg = msglist[i];
                     //投递给服务端，来自客户端本地的连接数据
-                    AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SData, msg.data);
+                    AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SForwardData, msg.data);
                     //发送后回收
-                    AppNoSugarNet.local._localMsgPool.Enqueue(msg);
+                    MsgQueuePool._MsgPool.Enqueue(msg);
                 }
             }
         }
@@ -232,10 +251,10 @@ namespace ServerCore.Manager
         /// </summary>
         /// <param name="uid"></param>
         /// <param name="tunnelId"></param>
-        public void OnServerLocalDisconnect(byte tunnelId, byte Idx)
+        public void OnRemoteLocalDisconnect(byte tunnelId, byte Idx)
         {
-            AppNoSugarNet.log.Debug($"OnServerLocalDisconnect {tunnelId},{Idx}");
+            AppNoSugarNet.log.Debug($"Forward->OnRemoteLocalDisconnect {tunnelId},{Idx}");
-            if (!GetLocalListener(tunnelId, out LocalListener _listener))
+            if (!GetLocalListener(tunnelId, out ForwardLocalListener _listener))
                 return;
             _listener.SetRemoteConnectd(Idx,false);
             _listener.CloseConnectByIdx(Idx);
@@ -249,15 +268,15 @@ namespace ServerCore.Manager
         /// <param name="uid"></param>
         /// <param name="tunnelId"></param>
         /// <param name="data"></param>
-        public void OnServerLocalDataCallBack(byte tunnelId,byte Idx, byte[] data)
+        public void OnRemoteLocalDataCallBack(byte tunnelId,byte Idx, byte[] data)
         {
-            //AppNoSugarNet.log.Info($"OnServerLocalDataCallBack {tunnelId},{Idx},Data长度：{data.Length}");
+            //AppNoSugarNet.log.Info($"OnRemoteLocalDataCallBack {tunnelId},{Idx},Data长度：{data.Length}");
-            if (!GetLocalListener(tunnelId, out LocalListener _listener))
+            if (!GetLocalListener(tunnelId, out ForwardLocalListener _listener))
                 return;
             //记录压缩前数据长度
             tReciveAllLenght += data.Length;
             //解压
-            data = mCompressAdapter.Decompress(data);
+            data = CompressAdapterSelector.Adapter(compressAdapterType).Decompress(data);
             _listener.SendSocketByIdx(Idx,data);
         }
         /// <summary>
@@ -266,16 +285,16 @@ namespace ServerCore.Manager
         /// <param name="uid"></param>
         /// <param name="tunnelId"></param>
         /// <param name="data"></param>
-        public void OnClientTunnelDataCallBack(byte tunnelId,byte Idx, byte[] data)
+        public void OnClientTunnelDataCallBack(long UID, byte tunnelId,byte Idx, byte[] data)
         {
-            //AppNoSugarNet.log.Info($"OnClientTunnelDataCallBack {tunnelId},{Idx}");
+            //AppNoSugarNet.log.Info($"OnClientTunnelDataCallBack {tunnelId},{Idx} data.Length->{data.Length}");
 
             int SlienLenght = 1000;
             //判断数据量大时分包
             if (data.Length > SlienLenght)
             {
-                byte[] tempSpan = data;
+                Span<byte> tempSpan = data;
-                byte[] tempSpanSlien = null;
+                Span<byte> tempSpanSlien = null;
                 int PageCount = (int)(data.Length / SlienLenght);
                 if (data.Length % SlienLenght > 0)
                 {
@@ -284,21 +303,13 @@ namespace ServerCore.Manager
 
                 for (int i = 0; i < PageCount; i++)
                 {
-                    tempSpanSlien = new byte[SlienLenght];
                     int StartIdx = i * SlienLenght;
                     if (i != PageCount - 1)//不是最后一个包
-                        Array.Copy(tempSpan, StartIdx, tempSpanSlien, 0, SlienLenght);
-                    else//最后一个
-                        Array.Copy(tempSpan, StartIdx, tempSpanSlien, 0, tempSpanSlien.Length - StartIdx);
-
-                    SendDataToRemote(tunnelId, Idx, tempSpanSlien);
-
-                    /*if (i != PageCount - 1)//不是最后一个包
                         tempSpanSlien = tempSpan.Slice(StartIdx, SlienLenght);
                     else//最后一个
                         tempSpanSlien = tempSpan.Slice(StartIdx);
 
-                    SendDataToRemote(tunnelId, Idx, tempSpanSlien.ToArray());*/
+                    SendDataToRemote(tunnelId, Idx, tempSpanSlien.ToArray());
                 }
                 return;
             }
@@ -308,18 +319,18 @@ namespace ServerCore.Manager
         void SendDataToRemote(byte tunnelId, byte Idx, byte[] data)
         {
             //压缩
-            data = mCompressAdapter.Compress(data);
+            data = CompressAdapterSelector.Adapter(compressAdapterType).Compress(data);
             //记录压缩后数据长度
             tSendAllLenght += data.Length;
 
-            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_C2S_DATA()
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_DATA()
             {
                 TunnelID = tunnelId,
                 Idx = Idx,
                 HunterNetCoreData = ByteString.CopyFrom(data)
             });
 
-            if (!GetLocalListener(tunnelId, out LocalListener _listener))
+            if (!GetLocalListener(tunnelId, out ForwardLocalListener _listener))
                 return;
 
             //远程未连接，添加到缓存
@@ -329,7 +340,7 @@ namespace ServerCore.Manager
                 return;
             }
             //投递给服务端，来自客户端本地的连接数据
-            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SData, respData);
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SForwardData, respData);
         }
         #endregion
 

NoSugarNet.ClientCore.Standard2/Manager/AppLogin.cs

@@ -1,21 +1,29 @@
 using AxibugProtobuf;
-using NoSugarNet.ClientCoreNet.Standard2.Common;
+using NoSugarNet.ClientCore.Common;
-using NoSugarNet.ClientCoreNet.Standard2.Network;
+using NoSugarNet.ClientCore.Network;
+using System;
 
-namespace NoSugarNet.ClientCoreNet.Standard2.Manager
+namespace NoSugarNet.ClientCore.Manager
 {
     public class AppLogin
     {
+        static string LastLoginGuid = "";
         public AppLogin()
         {
             NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdLogin, RecvLoginMsg);
         }
-        public void Login(string Account)
+
+        public void Login()
         {
+            AppNoSugarNet.log.Debug("-->Login");
+            if(string.IsNullOrEmpty(LastLoginGuid))
+                LastLoginGuid = Guid.NewGuid().ToString();
+
+            AppNoSugarNet.user.userdata.Account = LastLoginGuid;
             Protobuf_Login msg = new Protobuf_Login()
             {
                 LoginType = 0,
-                Account = Account,
+                Account = AppNoSugarNet.user.userdata.Account,
             };
             AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdLogin, ProtoBufHelper.Serizlize(msg));
         }
@@ -26,13 +34,13 @@ namespace NoSugarNet.ClientCoreNet.Standard2.Manager
             if (msg.Status == LoginResultStatus.Ok)
             {
                 AppNoSugarNet.log.Info("登录成功");
-                AppNoSugarNet.user.InitMainUserData(AppNoSugarNet.user.userdata.Account);
+                AppNoSugarNet.user.InitMainUserData(AppNoSugarNet.user.userdata.Account,msg.UID);
+                AppNoSugarNet.reverselocal.Send_ClientCfg();
             }
             else
             {
                 AppNoSugarNet.log.Info("登录失败");
             }
         }
-
     }
 }

NoSugarNet.ClientCore.Standard2/Manager/AppReverseLocalClient.cs

@@ -0,0 +1,365 @@
+using AxibugProtobuf;
+using Google.Protobuf;
+using NoSugarNet.Adapter;
+using NoSugarNet.Adapter.DataHelper;
+using NoSugarNet.ClientCore;
+using NoSugarNet.ClientCore.Common;
+using NoSugarNet.ClientCore.Network;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+
+namespace ServerCore.Manager
+{
+    public class AppReverseLocalClient
+    {
+        Dictionary<long, BackwardLocalClient> mDictCommKey2LocalClients = new Dictionary<long, BackwardLocalClient>();
+        NoSugarNet.Adapter.DataHelper.CompressAdapter mCompressAdapter;
+        //public LocalMsgQueuePool _localMsgPool = new LocalMsgQueuePool(1000);
+
+        public long tReciveAllLenght { get; private set; }
+        public long tSendAllLenght { get; private set; }
+
+        Protobuf_Cfgs _Send_Protobuf_Cfgs = new Protobuf_Cfgs();
+
+        static long GetCommKey(long Uid, int Tunnel, int Idx)
+        {
+            return (Uid * 10000000) + (Tunnel * 10000) + Idx;
+        }
+
+        static long GetUidForCommKey(long CommKey)
+        {
+            return CommKey / 10000000;
+        }
+
+        public AppReverseLocalClient(NoSugarNet.Adapter.DataHelper.E_CompressAdapter compressAdapterType)
+        {
+            AppNoSugarNet.log.Debug("Reverse->初始化压缩适配器" + compressAdapterType);
+            //初始化压缩适配器，暂时使用0，代表压缩类型
+            mCompressAdapter = new CompressAdapter(compressAdapterType);
+
+            //注册网络消息
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CReverseConnect, Recive_TunnelS2CConnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CReverseDisconnect, Recive_TunnelS2CDisconnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CReverseData, Recive_TunnelS2CData);
+        }
+
+        public void GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght)
+        {
+            resultReciveAllLenght = 0;
+            resultSendAllLenght = 0;
+            long[] Keys = mDictCommKey2LocalClients.Keys.ToArray();
+            for (int i = 0; i < Keys.Length; i++)
+            {
+                //local和转发 收发相反
+                resultSendAllLenght += mDictCommKey2LocalClients[Keys[i]].mReciveAllLenght;
+                resultReciveAllLenght += mDictCommKey2LocalClients[Keys[i]].mSendAllLenght;
+            }
+        }
+
+        public void Send_ClientCfg()
+        {
+            AppNoSugarNet.log.Debug("Reverse->-->Send_ClientCfg");
+
+            _Send_Protobuf_Cfgs.CompressAdapterType = (int)Config.compressAdapterType;
+            _Send_Protobuf_Cfgs.Cfgs.Clear();
+            foreach (var cfg in Config.cfgs)
+            {
+                _Send_Protobuf_Cfgs.Cfgs.Add(new Protobuf_Cfgs_Single() { Port = cfg.Value.RemoteLocalPort, TunnelID = cfg.Value.TunnelId });
+            }
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdClientCfgs, ProtoBufHelper.Serizlize(_Send_Protobuf_Cfgs));
+        }
+
+
+        #region 解析服务端下行数据
+        public void Recive_TunnelS2CConnect(byte[] reqData)
+        {
+            AppNoSugarNet.log.Debug("Reverse->Recive_TunnelS2CConnect");
+            Protobuf_Tunnel_Connect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Connect>(reqData);
+            if (msg.Connected == 1)
+                OnRemoteLocalConnect((byte)msg.TunnelID, (byte)msg.Idx);
+            else
+                OnRemoteLocalDisconnect((byte)msg.TunnelID, (byte)msg.Idx);
+        }
+        public void Recive_TunnelS2CDisconnect(byte[] reqData)
+        {
+            AppNoSugarNet.log.Debug("Reverse->Recive_TunnelS2CDisconnect");
+            Protobuf_Tunnel_Disconnect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Disconnect>(reqData);
+            OnRemoteLocalDisconnect((byte)msg.TunnelID, (byte)msg.Idx);
+        }
+        public void Recive_TunnelS2CData(byte[] reqData)
+        {
+            Protobuf_Tunnel_DATA msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_DATA>(reqData);
+            OnRemoteTunnelDataCallBack(AppNoSugarNet.user.userdata.UID, (byte)msg.TunnelID, (byte)msg.Idx, msg.HunterNetCoreData.ToArray());
+        }
+        #endregion
+
+
+        #region 两端本地端口连接事件通知
+
+        /// <summary>
+        /// 当服务端本地端口连接
+        /// </summary>
+        /// <param name="tunnelId"></param>
+        public void OnRemoteLocalConnect(byte tunnelId, byte Idx)
+        {
+            AppNoSugarNet.log.Debug($"Reverse->OnRemoteLocalConnect{AppNoSugarNet.user.userdata.UID},{tunnelId},{Idx}");
+
+            if (!Config.cfgs.ContainsKey(tunnelId))
+                return;
+
+            //开一个线程去建立连接
+            Thread thread = new Thread(() =>
+            {
+                //服务器本地局域网连接指定端口
+                TunnelClientData tunnelDataCfg = Config.cfgs[tunnelId];
+                BackwardLocalClient serverLocalClient = new BackwardLocalClient(AppNoSugarNet.user.userdata.UID, tunnelId, (byte)Idx);
+                serverLocalClient.BandEvent(AppNoSugarNet.log.Log, OnClientLocalConnect, OnClientLocalDisconnect, OnClientLocalDataCallBack);
+                //连接成功
+                if (!serverLocalClient.Init(tunnelDataCfg.LocalTargetIP, tunnelDataCfg.LocalTargetPort))
+                {
+                    //TODO告知客户端连接失败
+                    byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Connect()
+                    {
+                        TunnelID = tunnelId,
+                        Idx = (uint)Idx,
+                        Connected = 0//失败
+                    });
+                    //发送给客户端，指定服务端本地端口已连接
+                    AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SReverseConnect, respData);
+                }
+            });
+            thread.Start();
+        }
+        /// <summary>
+        /// 当服务端本地端口连接断开
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        public void OnRemoteLocalDisconnect(byte tunnelId, byte Idx)
+        {
+            AppNoSugarNet.log.Debug($"Reverse->OnRemoteLocalDisconnect {AppNoSugarNet.user.userdata.UID},{tunnelId},{Idx}");
+            
+            //隧道ID定位投递服务端本地连接
+            if (!GetClientLocalClient(AppNoSugarNet.user.userdata.UID, tunnelId, Idx, out BackwardLocalClient LocalClient))
+                return;
+
+            //断开服务端本地客户端连接
+            CloseClientLocalClient(AppNoSugarNet.user.userdata.UID, tunnelId, Idx);
+        }
+
+        /// <summary>
+        /// 当服务端本地端口连接
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        public void OnClientLocalConnect(long uid, byte tunnelId, byte Idx, BackwardLocalClient serverLocalClient)
+        {
+            AppNoSugarNet.log.Debug($"Reverse->OnServerLocalConnect {uid},{tunnelId},{Idx}");
+
+            //添加到服务端本地连接列表
+            AddClientLocalClient(uid, tunnelId, Idx, serverLocalClient);
+
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Connect()
+            {
+                TunnelID = tunnelId,
+                Idx = Idx,
+                Connected = 1
+            });
+            //发送给客户端，指定服务端本地端口已连接
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SReverseConnect,  respData);
+        }
+        /// <summary>
+        /// 当服务端本地端口连接断开
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        public void OnClientLocalDisconnect(long uid, byte tunnelId, byte Idx, BackwardLocalClient serverLocalClient)
+        {
+            AppNoSugarNet.log.Debug($"Reverse->OnClientLocalDisconnect {uid},{tunnelId},{Idx}");
+            //移除到服务端本地连接列表
+            RemoveClientLocalClient(uid, tunnelId, Idx);
+
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Disconnect()
+            {
+                TunnelID = tunnelId,
+                Idx = Idx,
+            });
+            //发送给客户端，指定服务端本地端口连接已断开
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SReverseDisconnect,  respData);
+        }
+        #endregion
+
+        #region 连接字典管理
+        /// <summary>
+        /// 追加连接
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        /// <param name="serverClient"></param>
+        void AddClientLocalClient(long uid, byte tunnelId, byte Idx, BackwardLocalClient serverClient)
+        {
+            long CommKey = GetCommKey(uid, tunnelId, Idx);
+            lock (mDictCommKey2LocalClients)
+            {
+                mDictCommKey2LocalClients[CommKey] = serverClient;
+            }
+        }
+        /// <summary>
+        /// 删除连接
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        void RemoveClientLocalClient(long uid, byte tunnelId, byte Idx)
+        {
+            lock (mDictCommKey2LocalClients)
+            {
+                long CommKey = GetCommKey(uid, tunnelId, Idx);
+
+                if (!mDictCommKey2LocalClients.ContainsKey(CommKey))
+                    return;
+                mDictCommKey2LocalClients[CommKey].Release();
+                mDictCommKey2LocalClients.Remove(CommKey);
+            }
+        }
+
+        bool GetClientLocalClient(long uid, byte tunnelId, byte Idx, out BackwardLocalClient serverLocalClient)
+        {
+            serverLocalClient = null;
+
+            long CommKey = GetCommKey(uid, tunnelId, Idx);
+
+            if (!mDictCommKey2LocalClients.ContainsKey(CommKey))
+                return false;
+
+            serverLocalClient = mDictCommKey2LocalClients[CommKey];
+            return true;
+        }
+
+        void CloseClientLocalClient(long uid, byte tunnelId, byte Idx)
+        {
+            //隧道ID定位投递服务端本地连接
+            if (!GetClientLocalClient(uid, tunnelId, Idx, out BackwardLocalClient _LocalClient))
+                return;
+            _LocalClient.CloseConntect();
+            RemoveClientLocalClient(uid, tunnelId, Idx);
+        }
+
+        public void GetClientCount(out int ClientUserCount, out int TunnelCount)
+        {
+            TunnelCount = mDictCommKey2LocalClients.Count;
+            long[] CommIDKeys = mDictCommKey2LocalClients.Keys.ToArray();
+            List<long> TempHadLocalConnetList = new List<long>();
+            for (int i = 0; i < CommIDKeys.Length; i++)
+            {
+                long uid = GetUidForCommKey(CommIDKeys[i]);
+                if (!TempHadLocalConnetList.Contains(uid))
+                    TempHadLocalConnetList.Add(uid);
+            }
+            ClientUserCount = TempHadLocalConnetList.Count;
+        }
+
+        public void StopAll(long Uid)
+        {
+            List<long> TempRemoveCommIDList = new List<long>();
+            lock (mDictCommKey2LocalClients)
+            {
+                long[] CommIDKeys = mDictCommKey2LocalClients.Keys.ToArray();
+                for (int i = 0; i < CommIDKeys.Length; i++)
+                {
+                    long CommID = CommIDKeys[i];
+                    long tempUid = GetUidForCommKey(CommID);
+                    if (tempUid == Uid)
+                        TempRemoveCommIDList.Add(CommID);
+                }
+            }
+
+            for (int i = 0; i < TempRemoveCommIDList.Count; i++)
+            {
+                long CommID = TempRemoveCommIDList[i];
+                if (!mDictCommKey2LocalClients.ContainsKey(CommID))
+                    continue;
+                BackwardLocalClient _serverLoackClient = mDictCommKey2LocalClients[CommID];
+                _serverLoackClient.CloseConntect();
+            }
+        }
+        #endregion
+
+
+        #region 数据投递
+        /// <summary>
+        /// 来自客户端本地连接投递的Tunnel数据
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        /// <param name="data"></param>
+        public void OnRemoteTunnelDataCallBack(long uid, byte tunnelId, byte Idx, byte[] data)
+        {
+            //隧道ID定位投递服务端本地连接
+            if (!GetClientLocalClient(uid, tunnelId, Idx, out BackwardLocalClient serverLocalClient))
+                return;
+            //记录数据长度
+            tReciveAllLenght += data.Length;
+            //解压
+            data = mCompressAdapter.Decompress(data);
+            //记录数据长度
+            serverLocalClient.mSendAllLenght += data.LongLength;
+            //发送给对应服务端本地连接数据
+            serverLocalClient.SendToServer(data);
+        }
+        /// <summary>
+        /// 来自服务端本地连接投递的Tunnel数据
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        /// <param name="data"></param>
+        public void OnClientLocalDataCallBack(long uid, byte tunnelId, byte Idx, byte[] data)
+        {
+            //AppNoSugarNet.log.Debug($"Reverse->OnClientLocalDataCallBack {uid},{tunnelId},{Idx},data -> {data.Length}");
+            int SlienLenght = 1000;
+            //判断数据量大时分包
+            if (data.Length > SlienLenght)
+            {
+                Span<byte> tempSpan = data;
+                Span<byte> tempSpanSlien = null;
+                int PageCount = (int)(data.Length / SlienLenght);
+                if (data.Length % SlienLenght > 0)
+                {
+                    PageCount++;
+                }
+
+                for (int i = 0; i < PageCount; i++)
+                {
+                    int StartIdx = i * SlienLenght;
+                    if (i != PageCount - 1)//不是最后一个包
+                        tempSpanSlien = tempSpan.Slice(StartIdx, SlienLenght);
+                    else//最后一个
+                        tempSpanSlien = tempSpan.Slice(StartIdx);
+
+                    SendDataToRemote(uid, tunnelId, Idx, tempSpanSlien.ToArray());
+                }
+                return;
+            }
+            SendDataToRemote(uid, tunnelId, Idx, data);
+        }
+        void SendDataToRemote(long uid, byte tunnelId, byte Idx, byte[] data)
+        {
+            //压缩
+            data = mCompressAdapter.Compress(data);
+            //记录压缩后数据长度
+            tSendAllLenght += data.Length;
+
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_DATA()
+            {
+                TunnelID = tunnelId,
+                Idx = Idx,
+                HunterNetCoreData = ByteString.CopyFrom(data)
+            });
+
+            //发送给客户端，指定客户端本地隧道ID
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SReverseData, respData);
+        }
+        #endregion
+    }
+}

NoSugarNet.ClientCore.Standard2/Manager/LocalClient/LocalListener.cs

@@ -1,264 +1,295 @@
-using HaoYueNet.ServerNetwork.Standard2;
+//using HaoYueNet.ServerNetwork;
-using System;
+//using System.Net.Sockets;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
 
-namespace NoSugarNet.ClientCoreNet.Standard2
+//namespace NoSugarNet.ClientCore
-{
+//{
-    public class LocalListener : TcpSaeaServer_SourceMode
+//    public class LocalListener : TcpSaeaServer_SourceMode
-    {
+//    {
-        public byte mTunnelID;
+//        public byte mTunnelID;
-        public long mReciveAllLenght;
+//        public long mReciveAllLenght;
-        public long mSendAllLenght;
+//        public long mSendAllLenght;
-        public LocalListener(int numConnections, int receiveBufferSize, byte TunnelID)
+//        public long currSeed;
-            : base(numConnections, receiveBufferSize)
+//        static long Seed;
-        {
-            OnClientNumberChange += ClientNumberChange;
-            OnReceive += ReceiveData;
-            OnDisconnected += OnDisconnect;
-            OnNetLog += OnShowNetLog;
 
-            mTunnelID = TunnelID;
+//        public LocalListener(int numConnections, int receiveBufferSize, byte TunnelID)
-        }
+//            : base(numConnections, receiveBufferSize)
+//        {
+//            OnClientNumberChange += ClientNumberChange;
+//            OnReceive += ReceiveData;
+//            OnDisconnected += OnDisconnect;
+//            OnNetLog += OnShowNetLog;
 
-        private void ClientNumberChange(int num, AsyncUserToken token)
+//            mTunnelID = TunnelID;
-        {
-            AppNoSugarNet.log.Info("Client数发生变化");
-            //增加连接数
-            if (num > 0)
-            {
-                int Idx = AddDictSocket(token.Socket);
-                if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInf))
-                {
-                    AppNoSugarNet.local.OnClientLocalConnect(mTunnelID, (byte)Idx);
-                }
-            }
-        }
 
-        /// <summary>
+//            currSeed = Seed++;
-        /// 通过下标发送
+//        }
-        /// </summary>
-        /// <param name="Idx"></param>
-        /// <param name="data"></param>
-        public void SendSocketByIdx(int Idx, byte[] data)
-        {
-            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
-            {
-                mSendAllLenght += data.Length;
-                SendToSocket(_localClientInfo._socket, data);
-            }
-            //TODO连接前缓存数据
-        }
 
-        /// <summary>
+//        private void ClientNumberChange(int num, AsyncUserToken token)
-        /// 接受包回调
+//        {
-        /// </summary>
+//            AppNoSugarNet.log.Info("Client数发生变化");
-        /// <param name="CMDID">协议ID</param>
+//            //增加连接数stsc
-        /// <param name="ERRCODE">错误编号</param>
+//            if (num > 0)
-        /// <param name="data">业务数据</param>
+//            {
-        private void ReceiveData(AsyncUserToken token, byte[] data)
+//                int Idx = AddDictSocket(token.Socket);
-        {
+//                if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInf))
-            DataCallBack(token.Socket, data);
+//                {
-        }
+//                    AppNoSugarNet.local.OnClientLocalConnect(mTunnelID, (byte)Idx);
+//                }
+//            }
+//        }
 
-        public void DataCallBack(Socket sk, byte[] data)
+//        /// <summary>
-        {
+//        /// 通过下标发送
-            //AppNoSugarNet.log.Info("收到消息 数据长度=>" + data.Length);
+//        /// </summary>
-            //记录接受长度
+//        /// <param name="Idx"></param>
-            mReciveAllLenght += data.Length;
+//        /// <param name="data"></param>
-            if (!GetSocketIdxBySocket(sk, out int Idx))
+//        public void SendSocketByIdx(int Idx, byte[] data)
-                return;
+//        {
-            try
+//            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
-            {
+//            {
-                //抛出网络数据
+//                mSendAllLenght += data.Length;
-                AppNoSugarNet.local.OnClientTunnelDataCallBack(mTunnelID, (byte)Idx, data);
+//                SendToSocket(_localClientInfo._socket, data);
-            }
+//            }
-            catch (Exception ex)
+//            //TODO连接前缓存数据
-            {
+//        }
-                AppNoSugarNet.log.Info("逻辑处理错误：" + ex.ToString());
-            }
-        }
 
-        public void CloseConnectByIdx(byte Idx)
+//        /// <summary>
-        {
+//        /// 接受包回调
-            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInf))
+//        /// </summary>
-            {
+//        /// <param name="CMDID">协议ID</param>
-                _localClientInf._socket.Shutdown(SocketShutdown.Both);
+//        /// <param name="ERRCODE">错误编号</param>
-            }
+//        /// <param name="data">业务数据</param>
-        }
+//        private void ReceiveData(AsyncUserToken token, byte[] data)
+//        {
+//            DataCallBack(token.Socket, data);
+//        }
 
-        /// <summary>
+//        public void DataCallBack(Socket sk, byte[] data)
-        /// 断开连接
+//        {
-        /// </summary>
+//            //AppNoSugarNet.log.Info("收到消息 数据长度=>" + data.Length);
-        /// <param name="sk"></param>
+//            //记录接受长度
-        public void OnDisconnect(AsyncUserToken token)
+//            mReciveAllLenght += data.Length;
-        {
+//            if (!GetSocketIdxBySocket(sk, out int Idx))
-            AppNoSugarNet.log.Info("断开连接");
+//                return;
+//            try
+//            {
+//                //抛出网络数据
+//                AppNoSugarNet.local.OnClientTunnelDataCallBack(mTunnelID, (byte)Idx, data);
+//            }
+//            catch (Exception ex)
+//            {
+//                AppNoSugarNet.log.Info("逻辑处理错误：" + ex.ToString());
+//            }
+//        }
 
-            if (!GetSocketIdxBySocket(token.Socket, out int Idx))
+//        public void CloseConnectByIdx(byte Idx)
-                return;
+//        {
+//            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+//            {
+//                //把未发送消息队列回收了
+//                while (_localClientInfo.msgQueue.Count > 0)
+//                {
+//                    IdxWithMsg msg = _localClientInfo.msgQueue.Dequeue();
+//                    AppNoSugarNet.local._localMsgPool.Enqueue(msg);
+//                }
 
-            AppNoSugarNet.local.OnClientLocalDisconnect(mTunnelID, (byte)Idx);
+//                _localClientInfo._socket.Shutdown(SocketShutdown.Both);
-            RemoveDictSocket(token.Socket);
+//            }
-        }
+//        }
 
-        public void OnShowNetLog(string msg)
+//        /// <summary>
-        {
+//        /// 断开连接
-            AppNoSugarNet.log.Info(msg);
+//        /// </summary>
-        }
+//        /// <param name="sk"></param>
+//        public void OnDisconnect(AsyncUserToken token)
+//        {
+//            AppNoSugarNet.log.Info("断开连接");
 
-        #region 一个轻量级无用户连接管理
+//            if (!GetSocketIdxBySocket(token.Socket, out int Idx))
-        Dictionary<IntPtr, int> DictSocketHandle2Idx = new Dictionary<IntPtr, int>();
+//                return;
-        Dictionary<int, LocalClientInfo> DictIdx2LocalClientInfo = new Dictionary<int, LocalClientInfo>();
-        int mSeedIdx = 0;
-        List<int> FreeIdxs = new List<int>();
-        public class LocalClientInfo
-        {
-            public Socket _socket;
-            public bool bRemoteConnect;
-            public bool bLocalConnect => _socket.Connected;
-            public Queue<IdxWithMsg> msgQueue = new Queue<IdxWithMsg>();
-        }
 
-        int GetNextIdx()
+//            AppNoSugarNet.local.OnClientLocalDisconnect(mTunnelID, (byte)Idx);
-        {
+//            RemoveDictSocket(token.Socket);
-            if (FreeIdxs.Count > 0)
+//        }
-            {
-                int Idx = FreeIdxs[0];
-                FreeIdxs.RemoveAt(0);
-                return Idx;
-            }
-            return mSeedIdx++;
-        }
 
-        /// <summary>
+//        public void OnShowNetLog(string msg)
-        /// 追加Socket返回下标
+//        {
-        /// </summary>
+//            AppNoSugarNet.log.Info(msg);
-        /// <param name="socket"></param>
+//        }
-        /// <returns></returns>
-        public int AddDictSocket(Socket socket)
-        {
-            if (socket == null)
-                return -1;
-            lock (DictSocketHandle2Idx)
-            {
-                int Idx = GetNextIdx();
-                DictSocketHandle2Idx[socket.Handle] = Idx;
-                DictIdx2LocalClientInfo[Idx] = new LocalClientInfo() { _socket = socket,bRemoteConnect = false};
-                return Idx;
-            }
-        }
 
-        public void RemoveDictSocket(Socket socket)
+//        #region 一个轻量级无用户连接管理
-        {
+//        Dictionary<IntPtr, int> DictSocketHandle2Idx = new Dictionary<IntPtr, int>();
-            if (socket == null)
+//        Dictionary<int, LocalClientInfo> DictIdx2LocalClientInfo = new Dictionary<int, LocalClientInfo>();
-                return;
+//        int mSeedIdx = 0;
-            lock (DictSocketHandle2Idx)
+//        List<int> FreeIdxs = new List<int>();
-            {
+//        public class LocalClientInfo
-                if (!DictSocketHandle2Idx.ContainsKey(socket.Handle))
+//        {
-                    return;
+//            public Socket _socket;
-                int Idx = DictSocketHandle2Idx[socket.Handle];
+//            public bool bRemoteConnect;
-                FreeIdxs.Add(Idx);
+//            public bool bLocalConnect => _socket.Connected;
-                if (DictIdx2LocalClientInfo.ContainsKey(Idx))
+//            public Queue<IdxWithMsg> msgQueue = new Queue<IdxWithMsg>();
-                    DictIdx2LocalClientInfo.Remove(Idx);
+//        }
-                DictSocketHandle2Idx.Remove(socket.Handle);
-            }
-        }
 
-        bool GetSocketByIdx(int Idx, out LocalClientInfo _localClientInfo)
+//        public Dictionary<int, LocalClientInfo> GetDictIdx2LocalClientInfo()
-        {
+//        {
-            if (!DictIdx2LocalClientInfo.ContainsKey(Idx))
+//            return DictIdx2LocalClientInfo;
-            {
+//        }
-                _localClientInfo = null;
-                return false;
-            }
 
-            _localClientInfo = DictIdx2LocalClientInfo[Idx];
+//        int GetNextIdx()
-            return true;
+//        {
-        }
+//            if (FreeIdxs.Count > 0)
+//            {
+//                int Idx = FreeIdxs[0];
+//                FreeIdxs.RemoveAt(0);
+//                return Idx;
+//            }
+//            return mSeedIdx++;
+//        }
 
-        public bool GetSocketIdxBySocket(Socket _socket, out int Idx)
+//        void ResetFree()
-        {
+//        {
-            if (_socket == null)
+//            FreeIdxs.Clear();
-            {
+//            mSeedIdx = 0;
-                Idx = -1;
+//        }
-                return false;
-            }
 
-            if (!DictSocketHandle2Idx.ContainsKey(_socket.Handle))
+//        /// <summary>
-            {
+//        /// 追加Socket返回下标
-                Idx = -1;
+//        /// </summary>
-                return false;
+//        /// <param name="socket"></param>
-            }
+//        /// <returns></returns>
+//        public int AddDictSocket(Socket socket)
+//        {
+//            if (socket == null)
+//                return -1;
+//            lock (DictSocketHandle2Idx)
+//            {
+//                int Idx = GetNextIdx();
+//                DictSocketHandle2Idx[socket.Handle] = Idx;
+//                DictIdx2LocalClientInfo[Idx] = new LocalClientInfo() { _socket = socket,bRemoteConnect = false};
+//                AppNoSugarNet.log.Debug($"AddDictSocket mTunnelID->{mTunnelID} Idx->{Idx} socket.Handle{socket.Handle}");
+//                return Idx;
+//            }
+//        }
 
-            Idx = DictSocketHandle2Idx[_socket.Handle];
+//        public void RemoveDictSocket(Socket socket)
-            return true;
+//        {
-        }
+//            if (socket == null)
+//                return;
+//            lock (DictSocketHandle2Idx)
+//            {
+//                if (!DictSocketHandle2Idx.ContainsKey(socket.Handle))
+//                    return;
+//                int Idx = DictSocketHandle2Idx[socket.Handle];
+//                FreeIdxs.Add(Idx);
+//                if (DictIdx2LocalClientInfo.ContainsKey(Idx))
+//                    DictIdx2LocalClientInfo.Remove(Idx);
+//                DictSocketHandle2Idx.Remove(socket.Handle);
+//                AppNoSugarNet.log.Debug($"RemoveDictSocket mTunnelID->{mTunnelID} Idx->{Idx} socket.Handle{socket.Handle}");
+//            }
+//        }
 
-        public bool CheckRemoteConnect(int Idx)
+//        bool GetSocketByIdx(int Idx, out LocalClientInfo _localClientInfo)
-        {
+//        {
-            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+//            if (!DictIdx2LocalClientInfo.ContainsKey(Idx))
-                return false;
+//            {
-            return _localClientInfo.bRemoteConnect;
+//                _localClientInfo = null;
-        }
+//                return false;
+//            }
 
-        public void SetRemoteConnectd(int Idx,bool bConnected)
+//            _localClientInfo = DictIdx2LocalClientInfo[Idx];
-        {
+//            return true;
-            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+//        }
-                return;
-            if (bConnected)
-                AppNoSugarNet.log.Info("远端本地连接已连接！！！！");
-            else
-                AppNoSugarNet.log.Info("远端本地连接已断开连接！！！！");
-            _localClientInfo.bRemoteConnect = bConnected;
-        }
 
-        public void StopAll()
+//        public bool GetSocketIdxBySocket(Socket _socket, out int Idx)
-        {
+//        {
-            lock (DictIdx2LocalClientInfo)
+//            if (_socket == null)
-            {
+//            {
-                int[] Idxs =  DictIdx2LocalClientInfo.Keys.ToArray();
+//                Idx = -1;
-                for (int i = 0; i < Idxs.Length; i++)
+//                return false;
-                {
+//            }
-                    CloseConnectByIdx((byte)Idxs[i]);
-                }
-                DictIdx2LocalClientInfo.Clear();
-            }
-        }
 
-        #endregion
+//            if (!DictSocketHandle2Idx.ContainsKey(_socket.Handle))
+//            {
+//                Idx = -1;
+//                return false;
+//            }
 
-        #region 缓存
+//            Idx = DictSocketHandle2Idx[_socket.Handle];
-        public void EnqueueIdxWithMsg(byte Idx, byte[] data)
+//            return true;
-        {
+//        }
-            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
-                return;
 
-            IdxWithMsg Msg = AppNoSugarNet.local._localMsgPool.Dequeue();
+//        public bool CheckRemoteConnect(int Idx)
-            Msg.Idx = Idx;
+//        {
-            Msg.data = data;
+//            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
-            _localClientInfo.msgQueue.Enqueue(Msg);
+//                return false;
-        }
+//            return _localClientInfo.bRemoteConnect;
-        public bool GetDictMsgQueue(byte Idx,out List<IdxWithMsg> MsgList)
+//        }
-        {
-            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo) || _localClientInfo.msgQueue.Count < 1)
-            {
-                MsgList = null;
-                return false;
-            }
 
-            MsgList = new List<IdxWithMsg>();
+//        public void SetRemoteConnectd(int Idx,bool bConnected)
-            lock (_localClientInfo.msgQueue)
+//        {
-            {
+//            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
-                while (_localClientInfo.msgQueue.Count > 0)
+//                return;
-                {
+//            if (bConnected)
-                    IdxWithMsg msg = _localClientInfo.msgQueue.Dequeue();
+//                AppNoSugarNet.log.Info("远端本地连接已连接！！！！");
-                    MsgList.Add(msg);
+//            else
-                }
+//                AppNoSugarNet.log.Info("远端本地连接已断开连接！！！！");
-                return true;
+//            _localClientInfo.bRemoteConnect = bConnected;
-            }
+//        }
-        }
+
-        #endregion
+//        public void StopAllLocalClient()
-    }
+//        {
-}
+//            lock (DictIdx2LocalClientInfo)
+//            {
+//                int[] Idxs =  DictIdx2LocalClientInfo.Keys.ToArray();
+//                for (int i = 0; i < Idxs.Length; i++)
+//                {
+//                    CloseConnectByIdx((byte)Idxs[i]);
+//                }
+//                DictIdx2LocalClientInfo.Clear();
+//                DictSocketHandle2Idx.Clear();
+//                ResetFree();
+
+//                //清理事件
+//                OnClientNumberChange -= ClientNumberChange;
+//                OnReceive -= ReceiveData;
+//                OnDisconnected -= OnDisconnect;
+//                OnNetLog -= OnShowNetLog;
+//            }
+//        }
+
+//        #endregion
+
+
+//        #region 缓存
+//        public void EnqueueIdxWithMsg(byte Idx, byte[] data)
+//        {
+//            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+//                return;
+
+//            IdxWithMsg Msg = AppNoSugarNet.local._localMsgPool.Dequeue();
+//            Msg.Idx = Idx;
+//            Msg.data = data;
+//            _localClientInfo.msgQueue.Enqueue(Msg);
+//        }
+//        public bool GetDictMsgQueue(byte Idx,out List<IdxWithMsg> MsgList)
+//        {
+//            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo) || _localClientInfo.msgQueue.Count < 1)
+//            {
+//                MsgList = null;
+//                return false;
+//            }
+
+//            MsgList = new List<IdxWithMsg>();
+//            lock (_localClientInfo.msgQueue)
+//            {
+//                while (_localClientInfo.msgQueue.Count > 0)
+//                {
+//                    IdxWithMsg msg = _localClientInfo.msgQueue.Dequeue();
+//                    MsgList.Add(msg);
+//                }
+//                return true;
+//            }
+//        }
+//        #endregion
+//    }
+//}

NoSugarNet.ClientCore.Standard2/Manager/LocalClient/LocalListener_Source.cs

@@ -1,292 +1,296 @@
-using HaoYueNet.ClientNetworkNet.Standard2.OtherMode;
+//using HaoYueNet.ClientNetwork.OtherMode;
-using System;
+//using HaoYueNet.ServerNetwork;
-using System.Collections.Generic;
+//using System.Net.Sockets;
-using System.Linq;
-using System.Net.Sockets;
 
-namespace NoSugarNet.ClientCoreNet.Standard2
+//namespace NoSugarNet.ClientCore
-{
+//{
-    public class LocalListener_Source : NetworkHelperCore_ListenerMode
+//    public class LocalListener_Source : NetworkHelperCore_ListenerMode
-    {
+//    {
-        public byte mTunnelID;
+//        public byte mTunnelID;
-        public long mReciveAllLenght;
+//        public long mReciveAllLenght;
-        public long mSendAllLenght;
+//        public long mSendAllLenght;
-        public LocalListener_Source(int numConnections, int receiveBufferSize, byte TunnelID)
+//        public LocalListener_Source(int numConnections, int receiveBufferSize, byte TunnelID)
-            : base()
+//            : base()
-        {
+//        {
-            OnConnected += ClientNumberChange;
+//            OnConnected += ClientNumberChange;
-            OnReceive += ReceiveData;
+//            OnReceive += ReceiveData;
-            OnDisconnected += OnDisconnectClient;
+//            OnDisconnected += OnDisconnectClient;
-            OnNetLog += OnShowNetLog;
+//            OnNetLog += OnShowNetLog;
 
-            mTunnelID = TunnelID;
+//            mTunnelID = TunnelID;
-        }
+//        }
 
-        private void ClientNumberChange(Socket socket)
+//        private void ClientNumberChange(Socket socket)
-        {
+//        {
-            AppNoSugarNet.log.Info("Client数发生变化");
+//            AppNoSugarNet.log.Info("Client数发生变化");
-            //增加连接数
+//            //增加连接数
-            int Idx = AddDictSocket(socket);
+//            int Idx = AddDictSocket(socket);
-            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInf))
+//            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInf))
-            {
+//            {
-                AppNoSugarNet.local.OnClientLocalConnect(mTunnelID, (byte)Idx);
+//                AppNoSugarNet.local.OnClientLocalConnect(mTunnelID, (byte)Idx);
-            }
+//            }
-        }
+//        }
 
-        /// <summary>
+//        /// <summary>
-        /// 通过下标发送
+//        /// 通过下标发送
-        /// </summary>
+//        /// </summary>
-        /// <param name="Idx"></param>
+//        /// <param name="Idx"></param>
-        /// <param name="data"></param>
+//        /// <param name="data"></param>
-        public void SendSocketByIdx(int Idx, byte[] data)
+//        public void SendSocketByIdx(int Idx, byte[] data)
-        {
+//        {
-            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+//            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
-            {
+//            {
-                mSendAllLenght += data.Length;
+//                mSendAllLenght += data.Length;
-                SendToClient(_localClientInfo._socket, data);
+//                SendToClient(_localClientInfo._socket, data);
-            }
+//            }
-            //TODO连接前缓存数据
+//            //TODO连接前缓存数据
-        }
+//        }
 
-        /// <summary>
+//        /// <summary>
-        /// 接受包回调
+//        /// 接受包回调
-        /// </summary>
+//        /// </summary>
-        /// <param name="CMDID">协议ID</param>
+//        /// <param name="CMDID">协议ID</param>
-        /// <param name="ERRCODE">错误编号</param>
+//        /// <param name="ERRCODE">错误编号</param>
-        /// <param name="data">业务数据</param>
+//        /// <param name="data">业务数据</param>
-        private void ReceiveData(Socket sk, byte[] data)
+//        private void ReceiveData(Socket sk, byte[] data)
-        {
+//        {
-            DataCallBack(sk, data);
+//            DataCallBack(sk, data);
-        }
+//        }
 
-        public void DataCallBack(Socket sk, byte[] data)
+//        public void DataCallBack(Socket sk, byte[] data)
-        {
+//        {
-            //AppNoSugarNet.log.Info("收到消息 数据长度=>" + data.Length);
+//            //AppNoSugarNet.log.Info("收到消息 数据长度=>" + data.Length);
-            //记录接受长度
+//            //记录接受长度
-            mReciveAllLenght += data.Length;
+//            mReciveAllLenght += data.Length;
-            if (!GetSocketIdxBySocket(sk, out int Idx))
+//            if (!GetSocketIdxBySocket(sk, out int Idx))
-                return;
+//                return;
-            try
+//            try
-            {
+//            {
-                if (GetMsgQueueByIdx(sk.Handle, out Queue<byte[]> _queue))
+//                if (GetMsgQueueByIdx(sk.Handle, out Queue<byte[]> _queue))
-                {
+//                {
-                    lock (_queue) 
+//                    lock (_queue) 
-                    {
+//                    {
-                        _queue.Enqueue(data);
+//                        _queue.Enqueue(data);
-                        while (_queue.Count > 0)
+//                        while (_queue.Count > 0)
-                        { 
+//                        { 
-                            AppNoSugarNet.local.OnClientTunnelDataCallBack(mTunnelID, (byte)Idx, _queue.Dequeue());
+//                            AppNoSugarNet.local.OnClientTunnelDataCallBack(mTunnelID, (byte)Idx, _queue.Dequeue());
-                        }
+//                        }
-                    }
+//                    }
-                }
+//                }
 
-                ////抛出网络数据
+//                ////抛出网络数据
-                //AppNoSugarNet.local.OnClientTunnelDataCallBack(mTunnelID, (byte)Idx, data);
+//                //AppNoSugarNet.local.OnClientTunnelDataCallBack(mTunnelID, (byte)Idx, data);
-            }
+//            }
-            catch (Exception ex)
+//            catch (Exception ex)
-            {
+//            {
-                AppNoSugarNet.log.Info("逻辑处理错误：" + ex.ToString());
+//                AppNoSugarNet.log.Info("逻辑处理错误：" + ex.ToString());
-            }
+//            }
-        }
+//        }
 
-        public void CloseConnectByIdx(byte Idx)
+//        public void CloseConnectByIdx(byte Idx)
-        {
+//        {
-            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInf))
+//            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInf))
-            {
+//            {
-                _localClientInf._socket.Shutdown(SocketShutdown.Both);
+//                _localClientInf._socket.Shutdown(SocketShutdown.Both);
-            }
+//            }
-        }
+//        }
 
-        /// <summary>
+//        /// <summary>
-        /// 断开连接
+//        /// 断开连接
-        /// </summary>
+//        /// </summary>
-        /// <param name="sk"></param>
+//        /// <param name="sk"></param>
-        public void OnDisconnectClient(Socket sk)
+//        public void OnDisconnectClient(Socket sk)
-        {
+//        {
-            AppNoSugarNet.log.Info("断开连接");
+//            AppNoSugarNet.log.Info("断开连接");
 
-            if (!GetSocketIdxBySocket(sk, out int Idx))
+//            if (!GetSocketIdxBySocket(sk, out int Idx))
-                return;
+//                return;
 
-            AppNoSugarNet.local.OnClientLocalDisconnect(mTunnelID, (byte)Idx);
+//            AppNoSugarNet.local.OnClientLocalDisconnect(mTunnelID, (byte)Idx);
-            RemoveDictSocket(sk);
+//            RemoveDictSocket(sk);
-        }
+//        }
 
-        public void OnShowNetLog(string msg)
+//        public void OnShowNetLog(string msg)
-        {
+//        {
-            AppNoSugarNet.log.Info(msg);
+//            AppNoSugarNet.log.Info(msg);
-        }
+//        }
 
-        #region 一个轻量级无用户连接管理
+//        #region 一个轻量级无用户连接管理
-        Dictionary<IntPtr, int> DictSocketHandle2Idx = new Dictionary<IntPtr, int>();
+//        Dictionary<IntPtr, int> DictSocketHandle2Idx = new Dictionary<IntPtr, int>();
-        Dictionary<IntPtr, Queue<byte[]>> DictSocketHandle2Msg = new Dictionary<IntPtr, Queue<byte[]>>();
+//        Dictionary<IntPtr, Queue<byte[]>> DictSocketHandle2Msg = new Dictionary<IntPtr, Queue<byte[]>>();
-        Dictionary<int, LocalClientInfo> DictIdx2LocalClientInfo = new Dictionary<int, LocalClientInfo>();
+//        Dictionary<int, LocalClientInfo> DictIdx2LocalClientInfo = new Dictionary<int, LocalClientInfo>();
-        int mSeedIdx = 0;
+//        int mSeedIdx = 0;
-        List<int> FreeIdxs = new List<int>();
+//        List<int> FreeIdxs = new List<int>();
-        public class LocalClientInfo
+//        public class LocalClientInfo
-        {
+//        {
-            public Socket _socket;
+//            public Socket _socket;
-            public bool bRemoteConnect;
+//            public bool bRemoteConnect;
-            public bool bLocalConnect => _socket.Connected;
+//            public bool bLocalConnect => _socket.Connected;
-            public Queue<IdxWithMsg> msgQueue = new Queue<IdxWithMsg>();
+//            public Queue<IdxWithMsg> msgQueue = new Queue<IdxWithMsg>();
-        }
+//        }
 
-        int GetNextIdx()
+//        int GetNextIdx()
-        {
+//        {
-            if (FreeIdxs.Count > 0)
+//            if (FreeIdxs.Count > 0)
-            {
+//            {
-                int Idx = FreeIdxs[0];
+//                int Idx = FreeIdxs[0];
-                FreeIdxs.RemoveAt(0);
+//                FreeIdxs.RemoveAt(0);
-                return Idx;
+//                return Idx;
-            }
+//            }
-            return mSeedIdx++;
+//            return mSeedIdx++;
-        }
+//        }
 
-        /// <summary>
+//        /// <summary>
-        /// 追加Socket返回下标
+//        /// 追加Socket返回下标
-        /// </summary>
+//        /// </summary>
-        /// <param name="socket"></param>
+//        /// <param name="socket"></param>
-        /// <returns></returns>
+//        /// <returns></returns>
-        public int AddDictSocket(Socket socket)
+//        public int AddDictSocket(Socket socket)
-        {
+//        {
-            if (socket == null)
+//            if (socket == null)
-                return -1;
+//                return -1;
-            lock (DictSocketHandle2Idx)
-            {
-                int Idx = GetNextIdx();
-                DictSocketHandle2Idx[socket.Handle] = Idx;
-                DictIdx2LocalClientInfo[Idx] = new LocalClientInfo() { _socket = socket,bRemoteConnect = false};
-                DictSocketHandle2Msg[socket.Handle] = new Queue<byte[]>();
-                return Idx;
-            }
-        }
 
-        public void RemoveDictSocket(Socket socket)
+//            lock (DictSocketHandle2Idx)
-        {
+//            {
-            if (socket == null)
+//                int Idx = GetNextIdx();
-                return;
+//                DictSocketHandle2Idx[socket.Handle] = Idx;
-            lock (DictSocketHandle2Idx)
+//                DictIdx2LocalClientInfo[Idx] = new LocalClientInfo() { _socket = socket,bRemoteConnect = false};
-            {
+//                DictSocketHandle2Msg[socket.Handle] = new Queue<byte[]>();
-                if (!DictSocketHandle2Idx.ContainsKey(socket.Handle))
+//                AppNoSugarNet.log.Debug($"AddDictSocket mTunnelID->{mTunnelID} Idx->{Idx} socket.Handle{socket.Handle}");
-                    return;
+//                return Idx;
-                int Idx = DictSocketHandle2Idx[socket.Handle];
+//            }
-                FreeIdxs.Add(Idx);
+//        }
-                if (DictIdx2LocalClientInfo.ContainsKey(Idx))
+
-                    DictIdx2LocalClientInfo.Remove(Idx);
+//        public void RemoveDictSocket(Socket socket)
+//        {
+//            if (socket == null)
+//                return;
+//            lock (DictSocketHandle2Idx)
+//            {
+//                if (!DictSocketHandle2Idx.ContainsKey(socket.Handle))
+//                    return;
+//                int Idx = DictSocketHandle2Idx[socket.Handle];
+//                FreeIdxs.Add(Idx);
+//                if (DictIdx2LocalClientInfo.ContainsKey(Idx))
+//                    DictIdx2LocalClientInfo.Remove(Idx);
                 
-                if (DictSocketHandle2Msg.ContainsKey(socket.Handle))
+//                if (DictSocketHandle2Msg.ContainsKey(socket.Handle))
-                    DictSocketHandle2Msg.Remove(socket.Handle);
+//                    DictSocketHandle2Msg.Remove(socket.Handle);
 
-                DictSocketHandle2Idx.Remove(socket.Handle);
+//                DictSocketHandle2Idx.Remove(socket.Handle);
-            }
-        }
 
-        bool GetSocketByIdx(int Idx, out LocalClientInfo _localClientInfo)
+//                AppNoSugarNet.log.Debug($"RemoveDictSocket mTunnelID->{mTunnelID} Idx->{Idx} socket.Handle{socket.Handle}");
-        {
+//            }
-            if (!DictIdx2LocalClientInfo.ContainsKey(Idx))
+//        }
-            {
-                _localClientInfo = null;
-                return false;
-            }
 
-            _localClientInfo = DictIdx2LocalClientInfo[Idx];
+//        bool GetSocketByIdx(int Idx, out LocalClientInfo _localClientInfo)
-            return true;
+//        {
-        }
+//            if (!DictIdx2LocalClientInfo.ContainsKey(Idx))
+//            {
+//                _localClientInfo = null;
+//                return false;
+//            }
 
-        bool GetMsgQueueByIdx(IntPtr handle, out Queue<byte[]> _queue)
+//            _localClientInfo = DictIdx2LocalClientInfo[Idx];
-        {
+//            return true;
-            if (!DictSocketHandle2Msg.ContainsKey(handle))
+//        }
-            {
-                _queue = null;
-                return false;
-            }
 
-            _queue = DictSocketHandle2Msg[handle];
+//        bool GetMsgQueueByIdx(IntPtr handle, out Queue<byte[]> _queue)
-            return true;
+//        {
-        }
+//            if (!DictSocketHandle2Msg.ContainsKey(handle))
+//            {
+//                _queue = null;
+//                return false;
+//            }
 
-        public bool GetSocketIdxBySocket(Socket _socket, out int Idx)
+//            _queue = DictSocketHandle2Msg[handle];
-        {
+//            return true;
-            if (_socket == null)
+//        }
-            {
-                Idx = -1;
-                return false;
-            }
 
-            if (!DictSocketHandle2Idx.ContainsKey(_socket.Handle))
+//        public bool GetSocketIdxBySocket(Socket _socket, out int Idx)
-            {
+//        {
-                Idx = -1;
+//            if (_socket == null)
-                return false;
+//            {
-            }
+//                Idx = -1;
+//                return false;
+//            }
 
-            Idx = DictSocketHandle2Idx[_socket.Handle];
+//            if (!DictSocketHandle2Idx.ContainsKey(_socket.Handle))
-            return true;
+//            {
-        }
+//                Idx = -1;
+//                return false;
+//            }
 
-        public bool CheckRemoteConnect(int Idx)
+//            Idx = DictSocketHandle2Idx[_socket.Handle];
-        {
+//            return true;
-            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+//        }
-                return false;
-            return _localClientInfo.bRemoteConnect;
-        }
 
-        public void SetRemoteConnectd(int Idx,bool bConnected)
+//        public bool CheckRemoteConnect(int Idx)
-        {
+//        {
-            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+//            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
-                return;
+//                return false;
-            if (bConnected)
+//            return _localClientInfo.bRemoteConnect;
-                AppNoSugarNet.log.Info("远端本地连接已连接！！！！");
+//        }
-            else
-                AppNoSugarNet.log.Info("远端本地连接已断开连接！！！！");
-            _localClientInfo.bRemoteConnect = bConnected;
-        }
 
-        public void StopAll()
+//        public void SetRemoteConnectd(int Idx,bool bConnected)
-        {
+//        {
-            lock (DictIdx2LocalClientInfo)
+//            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
-            {
+//                return;
-                int[] Idxs =  DictIdx2LocalClientInfo.Keys.ToArray();
+//            if (bConnected)
-                for (int i = 0; i < Idxs.Length; i++)
+//                AppNoSugarNet.log.Info("远端本地连接已连接！！！！");
-                {
+//            else
-                    CloseConnectByIdx((byte)Idxs[i]);
+//                AppNoSugarNet.log.Info("远端本地连接已断开连接！！！！");
-                }
+//            _localClientInfo.bRemoteConnect = bConnected;
-                DictIdx2LocalClientInfo.Clear();
+//        }
-            }
-        }
 
-        #endregion
+//        public void StopAll()
+//        {
+//            lock (DictIdx2LocalClientInfo)
+//            {
+//                int[] Idxs =  DictIdx2LocalClientInfo.Keys.ToArray();
+//                for (int i = 0; i < Idxs.Length; i++)
+//                {
+//                    CloseConnectByIdx((byte)Idxs[i]);
+//                }
+//                DictIdx2LocalClientInfo.Clear();
+//                FreeIdxs.Clear();
+//                mSeedIdx = 0;
+//            }
+//        }
+
+//        #endregion
 
 
-        #region 缓存
+//        #region 缓存
-        public void EnqueueIdxWithMsg(byte Idx, byte[] data)
+//        public void EnqueueIdxWithMsg(byte Idx, byte[] data)
-        {
+//        {
-            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+//            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
-                return;
+//                return;
 
-            IdxWithMsg Msg = AppNoSugarNet.local._localMsgPool.Dequeue();
+//            IdxWithMsg Msg = AppNoSugarNet.local._localMsgPool.Dequeue();
-            Msg.Idx = Idx;
+//            Msg.Idx = Idx;
-            Msg.data = data;
+//            Msg.data = data;
-            _localClientInfo.msgQueue.Enqueue(Msg);
+//            _localClientInfo.msgQueue.Enqueue(Msg);
-        }
+//        }
-        public bool GetDictMsgQueue(byte Idx,out List<IdxWithMsg> MsgList)
+//        public bool GetDictMsgQueue(byte Idx,out List<IdxWithMsg> MsgList)
-        {
+//        {
-            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo) || _localClientInfo.msgQueue.Count < 1)
+//            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo) || _localClientInfo.msgQueue.Count < 1)
-            {
+//            {
-                MsgList = null;
+//                MsgList = null;
-                return false;
+//                return false;
-            }
+//            }
 
-            MsgList = new List<IdxWithMsg>();
+//            MsgList = new List<IdxWithMsg>();
-            lock (_localClientInfo.msgQueue)
+//            lock (_localClientInfo.msgQueue)
-            {
+//            {
-                while (_localClientInfo.msgQueue.Count > 0)
+//                while (_localClientInfo.msgQueue.Count > 0)
-                {
+//                {
-                    IdxWithMsg msg = _localClientInfo.msgQueue.Dequeue();
+//                    IdxWithMsg msg = _localClientInfo.msgQueue.Dequeue();
-                    MsgList.Add(msg);
+//                    MsgList.Add(msg);
-                }
+//                }
-                return true;
+//                return true;
-            }
+//            }
-        }
+//        }
-        #endregion
+//        #endregion
-    }
+//    }
-}
+//}

NoSugarNet.ClientCore.Standard2/Manager/LocalClient/LocalMsgQueuePool.cs

@@ -1,55 +1,53 @@
-using System.Collections.Generic;
+//namespace NoSugarNet.ClientCore
+//{
+//    public class IdxWithMsg
+//    {
+//        public byte Idx;
+//        public byte[] data;
+//    }
 
-namespace NoSugarNet.ClientCoreNet.Standard2
+//    public class LocalMsgQueuePool
-{
+//    {
-    public class IdxWithMsg
+//        Queue<IdxWithMsg> msg_pool;
-    {
-        public byte Idx;
-        public byte[] data;
-    }
 
-    public class LocalMsgQueuePool
+//        public LocalMsgQueuePool(int capacity)
-    {
+//        {
-        Queue<IdxWithMsg> msg_pool;
+//            msg_pool = new Queue<IdxWithMsg>(capacity);
+//        }
 
-        public LocalMsgQueuePool(int capacity)
+//        /// <summary>
-        {
+//        /// 向 Queue 的末尾添加一个对象。
-            msg_pool = new Queue<IdxWithMsg>(capacity);
+//        /// </summary>
-        }
+//        /// <param name="item"></param>
+//        public void Enqueue(IdxWithMsg item)
+//        {
+//            lock (msg_pool)
+//            {
+//                item.Idx = 0;
+//                item.data = null;
+//                msg_pool.Enqueue(item);
+//            }
+//        }
 
-        /// <summary>
+//        //移除并返回在 Queue 的开头的对象。
-        /// 向 Queue 的末尾添加一个对象。
+//        public IdxWithMsg Dequeue()
-        /// </summary>
+//        {
-        /// <param name="item"></param>
+//            lock (msg_pool)
-        public void Enqueue(IdxWithMsg item)
+//            {
-        {
+//                if(msg_pool.Count > 0)
-            lock (msg_pool)
+//                    return msg_pool.Dequeue();
-            {
+//                return new IdxWithMsg();
-                item.Idx = 0;
+//            }
-                item.data = null;
+//        }
-                msg_pool.Enqueue(item);
-            }
-        }
 
-        //移除并返回在 Queue 的开头的对象。
+//        public int Count
-        public IdxWithMsg Dequeue()
+//        {
-        {
+//            get { return msg_pool.Count; }
-            lock (msg_pool)
+//        }
-            {
-                if(msg_pool.Count > 0)
-                    return msg_pool.Dequeue();
-                return new IdxWithMsg();
-            }
-        }
 
-        public int Count
+//        public void Clear()
-        {
+//        {
-            get { return msg_pool.Count; }
+//            msg_pool.Clear();
-        }
+//        }
-
+//    }
-        public void Clear()
+//}
-        {
-            msg_pool.Clear();
-        }
-    }
-}

NoSugarNet.ClientCore.Standard2/Manager/LogManager.cs

@@ -1,4 +1,4 @@
-namespace NoSugarNet.ClientCoreNet.Standard2.Manager
+namespace NoSugarNet.ClientCore.Manager
 {
     public class LogManager
     {
@@ -44,5 +44,10 @@
         {
             OnLog?.Invoke((int)logtype, str);
         }
+
+        public void Log(int logtype, string str)
+        {
+            OnLog?.Invoke(logtype, str);
+        }
     }
 }

NoSugarNet.ClientCore.Standard2/Manager/UserDataManager.cs

@@ -1,6 +1,6 @@
 using AxibugProtobuf;
 
-namespace NoSugarNet.ClientCoreNet.Standard2.Manager
+namespace NoSugarNet.ClientCore.Manager
 {
     public class UserDataBase
     {
@@ -23,10 +23,11 @@ namespace NoSugarNet.ClientCoreNet.Standard2.Manager
         public MainUserDataBase userdata { get;private set; } = new MainUserDataBase();
         public bool IsLoggedIn => userdata.IsLoggedIn;
 
-        public void InitMainUserData(string UName)
+        public void InitMainUserData(string UName,long UID)
         {
             userdata.Account = UName;
             userdata.IsLoggedIn = true;
+            userdata.UID = UID;
             //以及其他数据初始化
             //...
         }
@@ -49,7 +50,7 @@ namespace NoSugarNet.ClientCoreNet.Standard2.Manager
             //如果之前已登录，则重新登录
             if (userdata.IsLoggedIn)
             {
-                AppNoSugarNet.login.Login(userdata.Account);
+                AppNoSugarNet.login.Login();
             }
         }
     }

NoSugarNet.ClientCore.Standard2/NetStatus.cs

@@ -1,4 +1,4 @@
-namespace NoSugarNet.ClientCoreNet.Standard2
+namespace NoSugarNet.ClientCore
 {
     public struct NetStatus
     {

NoSugarNet.ClientCore.Standard2/Network/NetMsg.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace NoSugarNet.ClientCoreNet.Standard2.Network
+namespace NoSugarNet.ClientCore.Network
 {
 
     public class NetMsg

NoSugarNet.ClientCore.Standard2/Network/NetworkHelper.cs

@@ -1,8 +1,14 @@
-using HaoYueNet.ClientNetworkNet.Standard2;
+using AxibugProtobuf;
+using Google.Protobuf;
+using HaoYueNet.ClientNetwork;
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 
-namespace NoSugarNet.ClientCoreNet.Standard2.Network
+namespace NoSugarNet.ClientCore.Network
 {
     /// <summary>
     /// 继承网络库，以支持网络功能
@@ -28,7 +34,7 @@ namespace NoSugarNet.ClientCoreNet.Standard2.Network
         /// <summary>
         /// 是否自动重连
         /// </summary>
-        public bool bAutoReConnect = false;
+        public bool bAutoReConnect = true;
         /// <summary>
         /// 重连尝试时间
         /// </summary>
@@ -39,12 +45,21 @@ namespace NoSugarNet.ClientCoreNet.Standard2.Network
             NetworkDeBugLog($"NetworkConnected:{IsConnect}");
             if (IsConnect)
             {
-                AppNoSugarNet.login.Login(Guid.NewGuid().ToString());
+                //从未登录过
+                if (!AppNoSugarNet.user.IsLoggedIn)
+                {
+                    //首次登录
+                    AppNoSugarNet.login.Login();
+                }
             }
             else
             {
                 //连接失败
                 NetworkDeBugLog("连接失败！");
+
+                //停止所有
+                AppNoSugarNet.forwardlocal.StopAll();
+
                 //自动重连开关
                 if (bAutoReConnect)
                     ReConnect();
@@ -86,7 +101,8 @@ namespace NoSugarNet.ClientCoreNet.Standard2.Network
             NetworkDeBugLog("OnConnectClose");
 
             //停止所有
-            AppNoSugarNet.local.StopAll();
+            AppNoSugarNet.forwardlocal.StopAll();
+            AppNoSugarNet.reverselocal.StopAll(AppNoSugarNet.user.userdata.UID);
 
             //自动重连开关
             if (bAutoReConnect)

NoSugarNet.ClientCore.Standard2/NoSugarNet.Adapter/BackwardLocalClient.cs

@@ -0,0 +1,113 @@
+using HaoYueNet.ClientNetwork.OtherMode;
+using System;
+
+namespace NoSugarNet.Adapter
+{
+    /// <summary>
+    /// 继承网络库，以支持网络功能
+    /// </summary>
+    public class BackwardLocalClient : NetworkHelperCore_SourceMode
+    {
+        public long mUID;
+        public byte mTunnelID;
+        public byte mIdx;
+        public long mReciveAllLenght;
+        public long mSendAllLenght;
+
+        public delegate void OnBackwardLogOutHandler(int LogLevel, string Msg);
+        public delegate void OnBackwardConnectHandler(long uid, byte tunnelId, byte Idx, BackwardLocalClient serverLocalClient);
+        public delegate void OnBackwardDisconnectHandler(long uid, byte tunnelId, byte Idx, BackwardLocalClient serverLocalClient);
+        public delegate void OnBackwardDataCallBackHandler(long uid, byte tunnelId, byte Idx, byte[] data);
+
+        public event OnBackwardLogOutHandler OnBackwardLogOut;
+        public event OnBackwardConnectHandler OnBackwardConnect;
+        public event OnBackwardDisconnectHandler OnBackwardDisconnect;
+        public event OnBackwardDataCallBackHandler OnBackwardDataCallBack;
+
+        public BackwardLocalClient(long UID,byte TunnelID, byte Idx)
+        {
+            mUID = UID;
+            mTunnelID = TunnelID;
+            mIdx = Idx;
+            //指定接收服务器数据事件
+            OnReceiveData += GetDataCallBack;
+            //断开连接
+            OnClose += OnConnectClose;
+            OnConnected += NetworkConnected;
+            //网络库调试信息输出事件，用于打印网络内容
+            OnLogOut += NetworkDeBugLog;
+        }
+
+        public void BandEvent(
+            OnBackwardLogOutHandler _OnBackwardLogOut,
+            OnBackwardConnectHandler _OnConnect,
+            OnBackwardDisconnectHandler _OnDisconnect,
+            OnBackwardDataCallBackHandler _OnDataCallBack
+            )
+        {
+            OnBackwardLogOut += _OnBackwardLogOut;
+            OnBackwardConnect += _OnConnect;
+            OnBackwardDisconnect += _OnDisconnect;
+            OnBackwardDataCallBack += _OnDataCallBack;
+        }
+
+        public void NetworkConnected(bool IsConnect)
+        {
+            NetworkDeBugLog($"NetworkConnected:{IsConnect}");
+            if (IsConnect)
+            {
+                OnBackwardConnect?.Invoke(mUID, mTunnelID, mIdx, this);
+            }
+            else
+            {
+                //连接失败
+                NetworkDeBugLog("连接失败！");
+            }
+        }
+
+        public void NetworkDeBugLog(string str)
+        {
+            OnBackwardLogOut?.Invoke(1 ,"NetCoreDebug >> " + str);
+        }
+
+        /// <summary>
+        /// 接受包回调
+        /// </summary>
+        /// <param name="CMDID">协议ID</param>
+        /// <param name="ERRCODE">错误编号</param>
+        /// <param name="data">业务数据</param>
+        public void GetDataCallBack(byte[] data)
+        {
+            //NetworkDeBugLog("收到消息 数据长度=>" + data.Length);
+            try
+            {
+                //记录接收数据长度
+                mReciveAllLenght += data.Length;
+                //抛出网络数据
+                OnBackwardDataCallBack?.Invoke(mUID, mTunnelID, mIdx, data);
+            }
+            catch (Exception ex)
+            {
+                NetworkDeBugLog("逻辑处理错误：" + ex.ToString());
+            }
+
+        }
+
+        /// <summary>
+        /// 关闭连接
+        /// </summary>
+        void OnConnectClose()
+        {
+            NetworkDeBugLog("OnConnectClose");
+            OnBackwardDisconnect?.Invoke(mUID, mTunnelID,mIdx,this);
+        }
+
+        public void Release()
+        {
+            OnBackwardLogOut -= OnBackwardLogOut;
+            OnBackwardConnect -= OnBackwardConnect;
+            OnBackwardDisconnect -= OnBackwardDisconnect;
+            OnBackwardDataCallBack -= OnBackwardDataCallBack;
+        }
+    }
+}

NoSugarNet.ClientCore.Standard2/NoSugarNet.Adapter/DataHelper/CompressAdapter.cs

@@ -0,0 +1,94 @@
+using System.IO;
+using System.IO.Compression;
+
+namespace NoSugarNet.Adapter.DataHelper
+{
+    public enum E_CompressAdapter
+    {
+        //不压缩
+        None = 0,
+        //GIPZ
+        GZIP_Plan1 = 1,
+    }
+
+    /// <summary>
+    /// 压缩适配器
+    /// </summary>
+    public class CompressAdapter
+    {
+        IDataCompress mIDataCompress;
+        public CompressAdapter(E_CompressAdapter type)
+        {
+            switch (type)
+            {
+                //不压缩
+                case E_CompressAdapter.None:
+                    mIDataCompress = new NoCompress();
+                    break;
+                //GZIP Plan1
+                case E_CompressAdapter.GZIP_Plan1:
+                    mIDataCompress = new GZipCompress();
+                    break;
+                //TODO 其他压缩对比
+                //……
+                default:
+                    mIDataCompress = new NoCompress();
+                    break;
+            }
+        }
+
+        public byte[] Compress(byte[] data)
+        {
+            return mIDataCompress.Compress(data);
+        }
+        public byte[] Decompress(byte[] data)
+        {
+            return mIDataCompress.Decompress(data);
+        }
+    }
+
+
+    public interface IDataCompress
+    {
+        byte[] Compress(byte[] data);
+        byte[] Decompress(byte[] data);
+    }
+
+    public class NoCompress : IDataCompress
+    {
+        public byte[] Compress(byte[] data)
+        {
+            return data;
+        }
+        public byte[] Decompress(byte[] data)
+        {
+            return data;
+        }
+    }
+
+    public class GZipCompress : IDataCompress
+    {
+        public byte[] Compress(byte[] data)
+        {
+            using (var compressedStream = new MemoryStream())
+            using (var zipStream = new GZipStream(compressedStream, CompressionMode.Compress))
+            {
+                zipStream.Write(data, 0, data.Length);
+                zipStream.Close();
+                return compressedStream.ToArray();
+            }
+        }
+
+        public byte[] Decompress(byte[] data)
+        {
+            using (var compressedStream = new MemoryStream(data))
+            using (var zipStream = new GZipStream(compressedStream, CompressionMode.Decompress))
+            using (var resultStream = new MemoryStream())
+            {
+                zipStream.CopyTo(resultStream);
+                return resultStream.ToArray();
+            }
+        }
+    }
+
+}

NoSugarNet.ClientCore.Standard2/NoSugarNet.Adapter/DataHelper/CompressAdapterSelector.cs

@@ -0,0 +1,19 @@
+using NoSugarNet.Adapter.DataHelper;
+using System.Collections.Generic;
+
+namespace NoSugarNet.Adapter.DataHelper
+{
+    public static class CompressAdapterSelector
+    {
+        static Dictionary<E_CompressAdapter, CompressAdapter> mDictAdapter = new Dictionary<E_CompressAdapter, CompressAdapter>();
+
+        public static CompressAdapter Adapter(E_CompressAdapter adptType)
+        {
+            if(mDictAdapter.ContainsKey(adptType))
+                return mDictAdapter[adptType];
+
+            mDictAdapter[adptType] = new CompressAdapter(adptType);
+            return mDictAdapter[adptType];
+        }
+    }
+}

NoSugarNet.ClientCore.Standard2/NoSugarNet.Adapter/ForwardLocalListener.cs

@@ -0,0 +1,347 @@
+using HaoYueNet.ServerNetwork.Standard2;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Sockets;
+
+namespace NoSugarNet.Adapter
+{
+    public class ForwardLocalListener : TcpSaeaServer_SourceMode
+    {
+        public byte mTunnelID;
+        public long mReciveAllLenght;
+        public long mSendAllLenght;
+        public long currSeed;
+        public long mUid;
+        static long Seed;
+
+        public enum AdptLogLevel
+        {
+            Debug,
+            Info,
+            Warning,
+            Error
+        }
+
+        public delegate void OnLogOutHandler(int LogLevel,string Msg);
+        public delegate void OnClientLocalConnectHandler(long UID, byte tunnelId, byte _Idx);
+        public delegate void OnClientLocalDisconnectHandler(long UID, byte tunnelId, byte _Idx);
+        public delegate void OnClientTunnelDataCallBackHandler(long UID, byte tunnelId, byte Idx, byte[] data);
+
+        public event OnLogOutHandler OnForwardLogOut;
+        public event OnClientLocalConnectHandler OnClientLocalConnect;
+        public event OnClientLocalDisconnectHandler OnClientLocalDisconnect;
+        public event OnClientTunnelDataCallBackHandler OnClientTunnelDataCallBack;
+
+        public ForwardLocalListener(int numConnections, int receiveBufferSize, byte TunnelID, long mUid)
+            : base(numConnections, receiveBufferSize)
+        {
+            OnClientNumberChange += ClientNumberChange;
+            OnReceive += ReceiveData;
+            OnDisconnected += OnDisconnect;
+            OnNetLog += OnShowNetLog;
+
+            mTunnelID = TunnelID;
+
+            currSeed = Seed++;
+            this.mUid = mUid;
+        }
+
+
+
+        public event OnLogOutHandler OnForwardLogOut2;
+
+        public void BandEvent(
+            OnLogOutHandler _OnLogOut,
+            OnClientLocalConnectHandler _OnClientLocalConnect,
+            OnClientLocalDisconnectHandler _OnClientLocalDisconnect,
+            OnClientTunnelDataCallBackHandler _ClientTunnelDataCall
+            )
+        {
+            OnForwardLogOut += _OnLogOut;
+            OnClientLocalConnect += _OnClientLocalConnect;
+            OnClientLocalDisconnect += _OnClientLocalDisconnect;
+            OnClientTunnelDataCallBack += _ClientTunnelDataCall;
+        }
+
+        public void StartListener(uint port)
+        {
+            Init();
+            Start(new IPEndPoint(IPAddress.Any.Address, (int)port));
+        }
+
+        private void ClientNumberChange(int num, AsyncUserToken token)
+        {
+            OnForwardLogOut?.Invoke((int)AdptLogLevel.Info, "Client数发生变化");
+            //增加连接数stsc
+            if (num > 0)
+            {
+                int Idx = AddDictSocket(token.Socket);
+                if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInf))
+                {
+                    OnClientLocalConnect?.Invoke(mUid, mTunnelID, (byte)Idx);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 通过下标发送
+        /// </summary>
+        /// <param name="Idx"></param>
+        /// <param name="data"></param>
+        public void SendSocketByIdx(int Idx, byte[] data)
+        {
+            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+            {
+                mSendAllLenght += data.Length;
+                SendToSocket(_localClientInfo._socket, data);
+            }
+            //TODO连接前缓存数据
+        }
+
+        /// <summary>
+        /// 接受包回调
+        /// </summary>
+        /// <param name="CMDID">协议ID</param>
+        /// <param name="ERRCODE">错误编号</param>
+        /// <param name="data">业务数据</param>
+        private void ReceiveData(AsyncUserToken token, byte[] data)
+        {
+            DataCallBack(token.Socket, data);
+        }
+
+        public void DataCallBack(Socket sk, byte[] data)
+        {
+            //AppNoSugarNet.log.Info("收到消息 数据长度=>" + data.Length);
+            //记录接受长度
+            mReciveAllLenght += data.Length;
+            if (!GetSocketIdxBySocket(sk, out int Idx))
+                return;
+            try
+            {
+                //抛出网络数据
+                OnClientTunnelDataCallBack?.Invoke(mUid, mTunnelID, (byte)Idx, data);
+            }
+            catch (Exception ex)
+            {
+                OnForwardLogOut?.Invoke((int)AdptLogLevel.Error,"逻辑处理错误：" + ex.ToString());
+            }
+        }
+
+        public void CloseConnectByIdx(byte Idx)
+        {
+            if (GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+            {
+                //把未发送消息队列回收了
+                while (_localClientInfo.msgQueue.Count > 0)
+                {
+                    IdxWithMsg msg = _localClientInfo.msgQueue.Dequeue();
+                    MsgQueuePool._MsgPool.Enqueue(msg);
+                }
+
+                _localClientInfo._socket.Shutdown(SocketShutdown.Both);
+            }
+        }
+
+        /// <summary>
+        /// 断开连接
+        /// </summary>
+        /// <param name="sk"></param>
+        public void OnDisconnect(AsyncUserToken token)
+        {
+            OnForwardLogOut?.Invoke((int)AdptLogLevel.Info,"断开连接");
+
+            if (!GetSocketIdxBySocket(token.Socket, out int Idx))
+                return;
+
+            OnClientLocalDisconnect?.Invoke(mUid, mTunnelID, (byte)Idx);
+            RemoveDictSocket(token.Socket);
+        }
+
+        public void OnShowNetLog(string msg)
+        {
+            OnForwardLogOut?.Invoke((int)AdptLogLevel.Info, msg);
+        }
+
+        #region 一个轻量级无用户连接管理
+        Dictionary<IntPtr, int> DictSocketHandle2Idx = new Dictionary<IntPtr, int>();
+        Dictionary<int, LocalClientInfo> DictIdx2LocalClientInfo = new Dictionary<int, LocalClientInfo>();
+        int mSeedIdx = 0;
+        List<int> FreeIdxs = new List<int>();
+        public class LocalClientInfo
+        {
+            public Socket _socket;
+            public bool bRemoteConnect;
+            public bool bLocalConnect => _socket.Connected;
+            public Queue<IdxWithMsg> msgQueue = new Queue<IdxWithMsg>();
+        }
+
+        public Dictionary<int, LocalClientInfo> GetDictIdx2LocalClientInfo()
+        {
+            return DictIdx2LocalClientInfo;
+        }
+
+        int GetNextIdx()
+        {
+            if (FreeIdxs.Count > 0)
+            {
+                int Idx = FreeIdxs[0];
+                FreeIdxs.RemoveAt(0);
+                return Idx;
+            }
+            return mSeedIdx++;
+        }
+
+        void ResetFree()
+        {
+            FreeIdxs.Clear();
+            mSeedIdx = 0;
+        }
+
+        /// <summary>
+        /// 追加Socket返回下标
+        /// </summary>
+        /// <param name="socket"></param>
+        /// <returns></returns>
+        public int AddDictSocket(Socket socket)
+        {
+            if (socket == null)
+                return -1;
+            lock (DictSocketHandle2Idx)
+            {
+                int Idx = GetNextIdx();
+                DictSocketHandle2Idx[socket.Handle] = Idx;
+                DictIdx2LocalClientInfo[Idx] = new LocalClientInfo() { _socket = socket,bRemoteConnect = false};
+                OnForwardLogOut?.Invoke((int)AdptLogLevel.Debug, $"AddDictSocket mTunnelID->{mTunnelID} Idx->{Idx} socket.Handle{socket.Handle}");
+                return Idx;
+            }
+        }
+
+        public void RemoveDictSocket(Socket socket)
+        {
+            if (socket == null)
+                return;
+            lock (DictSocketHandle2Idx)
+            {
+                if (!DictSocketHandle2Idx.ContainsKey(socket.Handle))
+                    return;
+                int Idx = DictSocketHandle2Idx[socket.Handle];
+                FreeIdxs.Add(Idx);
+                if (DictIdx2LocalClientInfo.ContainsKey(Idx))
+                    DictIdx2LocalClientInfo.Remove(Idx);
+                DictSocketHandle2Idx.Remove(socket.Handle);
+                OnForwardLogOut?.Invoke((int)AdptLogLevel.Debug, $"RemoveDictSocket mTunnelID->{mTunnelID} Idx->{Idx} socket.Handle{socket.Handle}");
+            }
+        }
+
+        bool GetSocketByIdx(int Idx, out LocalClientInfo _localClientInfo)
+        {
+            if (!DictIdx2LocalClientInfo.ContainsKey(Idx))
+            {
+                _localClientInfo = null;
+                return false;
+            }
+
+            _localClientInfo = DictIdx2LocalClientInfo[Idx];
+            return true;
+        }
+
+        public bool GetSocketIdxBySocket(Socket _socket, out int Idx)
+        {
+            if (_socket == null)
+            {
+                Idx = -1;
+                return false;
+            }
+
+            if (!DictSocketHandle2Idx.ContainsKey(_socket.Handle))
+            {
+                Idx = -1;
+                return false;
+            }
+
+            Idx = DictSocketHandle2Idx[_socket.Handle];
+            return true;
+        }
+
+        public bool CheckRemoteConnect(int Idx)
+        {
+            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+                return false;
+            return _localClientInfo.bRemoteConnect;
+        }
+
+        public void SetRemoteConnectd(int Idx,bool bConnected)
+        {
+            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+                return;
+            if (bConnected)
+                OnForwardLogOut?.Invoke((int)AdptLogLevel.Info,"远端本地连接已连接！！！！");
+            else
+                OnForwardLogOut?.Invoke((int)AdptLogLevel.Info, "远端本地连接已断开连接！！！！");
+            _localClientInfo.bRemoteConnect = bConnected;
+        }
+
+        public void StopAllLocalClient()
+        {
+            lock (DictIdx2LocalClientInfo)
+            {
+                int[] Idxs =  DictIdx2LocalClientInfo.Keys.ToArray();
+                for (int i = 0; i < Idxs.Length; i++)
+                {
+                    CloseConnectByIdx((byte)Idxs[i]);
+                }
+                DictIdx2LocalClientInfo.Clear();
+                DictSocketHandle2Idx.Clear();
+                ResetFree();
+            }
+        }
+
+        public void StopWithClear()
+        {
+            base.Stop();
+            //清理事件
+            OnForwardLogOut -= OnForwardLogOut;
+            OnClientLocalConnect -= OnClientLocalConnect;
+            OnClientLocalDisconnect -= OnClientLocalDisconnect;
+            OnClientTunnelDataCallBack -= OnClientTunnelDataCallBack;
+        }
+
+        #endregion
+
+
+        #region 缓存
+        public void EnqueueIdxWithMsg(byte Idx, byte[] data)
+        {
+            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo))
+                return;
+
+            IdxWithMsg Msg = MsgQueuePool._MsgPool.Dequeue();
+            Msg.Idx = Idx;
+            Msg.data = data;
+            _localClientInfo.msgQueue.Enqueue(Msg);
+        }
+        public bool GetDictMsgQueue(byte Idx,out List<IdxWithMsg> MsgList)
+        {
+            if (!GetSocketByIdx(Idx, out LocalClientInfo _localClientInfo) || _localClientInfo.msgQueue.Count < 1)
+            {
+                MsgList = null;
+                return false;
+            }
+
+            MsgList = new List<IdxWithMsg>();
+            lock (_localClientInfo.msgQueue)
+            {
+                while (_localClientInfo.msgQueue.Count > 0)
+                {
+                    IdxWithMsg msg = _localClientInfo.msgQueue.Dequeue();
+                    MsgList.Add(msg);
+                }
+                return true;
+            }
+        }
+        #endregion
+    }
+
+}

NoSugarNet.ClientCore.Standard2/NoSugarNet.Adapter/LocalMsgQueuePool.cs

@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+
+namespace NoSugarNet.Adapter
+{
+    public class IdxWithMsg
+    {
+        public byte Idx;
+        public byte[] data;
+    }
+
+    public class MsgQueuePool
+    {
+        public static MsgQueuePool _MsgPool = new MsgQueuePool(1000);
+
+        Queue<IdxWithMsg> msg_pool;
+
+        public MsgQueuePool(int capacity)
+        {
+            msg_pool = new Queue<IdxWithMsg>(capacity);
+        }
+
+        /// <summary>
+        /// 向 Queue 的末尾添加一个对象。
+        /// </summary>
+        /// <param name="item"></param>
+        public void Enqueue(IdxWithMsg item)
+        {
+            lock (msg_pool)
+            {
+                item.Idx = 0;
+                item.data = null;
+                msg_pool.Enqueue(item);
+            }
+        }
+
+        //移除并返回在 Queue 的开头的对象。
+        public IdxWithMsg Dequeue()
+        {
+            lock (msg_pool)
+            {
+                if(msg_pool.Count > 0)
+                    return msg_pool.Dequeue();
+                return new IdxWithMsg();
+            }
+        }
+
+        public int Count
+        {
+            get { return msg_pool.Count; }
+        }
+
+        public void Clear()
+        {
+            msg_pool.Clear();
+        }
+    }
+}

NoSugarNet.ClientCore.Standard2/NoSugarNet.ClientCore.Standard2.csproj

@@ -13,8 +13,8 @@
     <Reference Include="Google.Protobuf">
       <HintPath>..\Lib\Google.Protobuf.dll</HintPath>
     </Reference>
-    <Reference Include="HaoYueNet.ClientNetworkNet.Standard2">
+    <Reference Include="HaoYueNet.ClientNetwork.Standard2">
-      <HintPath>..\Lib\NetLib_Standard2\HaoYueNet.ClientNetworkNet.Standard2.dll</HintPath>
+      <HintPath>..\Lib\NetLib_Standard2\HaoYueNet.ClientNetwork.Standard2.dll</HintPath>
     </Reference>
     <Reference Include="HaoYueNet.ServerNetwork.Standard2">
       <HintPath>..\Lib\NetLib_Standard2\HaoYueNet.ServerNetwork.Standard2.dll</HintPath>

NoSugarNet.ClientCore.Standard2/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2024-04-15T06:51:39.2435225Z;True|2024-04-15T14:51:19.4250865+08:00;True|2024-04-15T14:49:22.9829361+08:00;</History>
+    <History>True|2024-10-18T08:27:43.7757014Z||;True|2024-10-18T16:15:48.7317736+08:00||;True|2024-10-18T15:37:40.8031046+08:00||;True|2024-10-18T15:36:28.8043094+08:00||;True|2024-04-15T14:51:39.2435225+08:00||;True|2024-04-15T14:51:19.4250865+08:00||;True|2024-04-15T14:49:22.9829361+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

NoSugarNet.ClientCore/AppNoSugarNet.cs

@@ -1,4 +1,6 @@
-using NoSugarNet.ClientCore.Manager;
+using NoSugarNet.Adapter.DataHelper;
+using NoSugarNet.ClientCore.Common;
+using NoSugarNet.ClientCore.Manager;
 using NoSugarNet.ClientCore.Network;
 using ServerCore.Manager;
 using static NoSugarNet.ClientCore.Manager.LogManager;
@@ -15,28 +17,35 @@ namespace NoSugarNet.ClientCore
         public static NetworkHelper networkHelper;
         public static AppLogin login;
         public static AppChat chat;
-        public static AppLocalClient local;
+        public static AppForwardLocalClient forwardlocal;
+        public static AppReverseLocalClient reverselocal;
         public static UserDataManager user;
         public static System.Timers.Timer _SpeedCheckTimeTimer;//速度检测计时器
         public static int TimerInterval = 1000;//计时器间隔
-        static NetStatus netStatus;
+        static NetStatus Forward_NetStatus;
+        static NetStatus Reverse_NetStatus;
 
         #region 委托和事件
-        public delegate void OnUpdateStatusHandler(NetStatus Status);
+        public delegate void OnUpdateStatusHandler(NetStatus ForwardStatus, NetStatus ReverseStatus);
         public static event OnUpdateStatusHandler OnUpdateStatus;
         #endregion
 
-        public static void Init(OnLogHandler onLog = null)
+        public static void Init(Dictionary<byte, TunnelClientData> cfgs, int compressAdapterType = 0,OnLogHandler onLog = null)
         {
+            Config.cfgs = cfgs;
+            Config.compressAdapterType = (E_CompressAdapter)compressAdapterType;
+
             log = new LogManager();
             if(onLog != null)
                 LogManager.OnLog += onLog;
             networkHelper = new NetworkHelper();
             login = new AppLogin();
             chat = new AppChat();
-            local = new AppLocalClient();
+            forwardlocal = new AppForwardLocalClient();
+            reverselocal = new AppReverseLocalClient(Config.compressAdapterType);
             user = new UserDataManager();
-            netStatus = new NetStatus();
+            Forward_NetStatus = new NetStatus();
+            Reverse_NetStatus = new NetStatus();
             _SpeedCheckTimeTimer = new System.Timers.Timer();
             _SpeedCheckTimeTimer.Interval = TimerInterval;
             _SpeedCheckTimeTimer.Elapsed += Checktimer_Elapsed;
@@ -53,7 +62,7 @@ namespace NoSugarNet.ClientCore
 
         public static void Close()
         {
-            local.StopAll();
+            forwardlocal.StopAll();
             networkHelper.CloseConntect();
             AppNoSugarNet.log.Info("停止");
             _SpeedCheckTimeTimer.Enabled = false;
@@ -61,24 +70,45 @@ namespace NoSugarNet.ClientCore
 
         static void Checktimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
-            local.GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght);
-            local.GetClientCount(out int ClientUserCount, out int TunnelCount);
-
-            NetStatus resutnetStatus = new NetStatus()
             {
-                TunnelCount = TunnelCount,
+                forwardlocal.GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght);
-                ClientUserCount = ClientUserCount,
+                forwardlocal.GetClientCount(out int ClientUserCount, out int TunnelCount);
-                srcSendAllLenght = resultSendAllLenght,
+                NetStatus resutnetStatus = new NetStatus()
-                srcReciveAllLenght = resultReciveAllLenght,
+                {
-                srcReciveSecSpeed = (resultReciveAllLenght - netStatus.srcReciveAllLenght) / (TimerInterval / 1000),
+                    TunnelCount = TunnelCount,
-                srcSendSecSpeed = (resultSendAllLenght - netStatus.srcSendAllLenght) / (TimerInterval / 1000),
+                    ClientUserCount = ClientUserCount,
-                tSendAllLenght = local.tSendAllLenght,
+                    srcSendAllLenght = resultSendAllLenght,
-                tReciveAllLenght = local.tReciveAllLenght,
+                    srcReciveAllLenght = resultReciveAllLenght,
-                tSendSecSpeed = (local.tSendAllLenght - netStatus.tSendAllLenght) / (TimerInterval / 1000),
+                    srcReciveSecSpeed = (resultReciveAllLenght - Forward_NetStatus.srcReciveAllLenght) / (TimerInterval / 1000),
-                tReciveSecSpeed = (local.tReciveAllLenght - netStatus.tReciveAllLenght) / (TimerInterval / 1000),
+                    srcSendSecSpeed = (resultSendAllLenght - Forward_NetStatus.srcSendAllLenght) / (TimerInterval / 1000),
-            };
+                    tSendAllLenght = forwardlocal.tSendAllLenght,
-            netStatus = resutnetStatus;
+                    tReciveAllLenght = forwardlocal.tReciveAllLenght,
-            OnUpdateStatus?.Invoke(resutnetStatus);
+                    tSendSecSpeed = (forwardlocal.tSendAllLenght - Forward_NetStatus.tSendAllLenght) / (TimerInterval / 1000),
+                    tReciveSecSpeed = (forwardlocal.tReciveAllLenght - Forward_NetStatus.tReciveAllLenght) / (TimerInterval / 1000),
+                };
+                Forward_NetStatus = resutnetStatus;
+            }
+
+            {
+                reverselocal.GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght);
+                reverselocal.GetClientCount(out int ClientUserCount, out int TunnelCount);
+                NetStatus resutnetStatus = new NetStatus()
+                {
+                    TunnelCount = TunnelCount,
+                    ClientUserCount = ClientUserCount,
+                    srcSendAllLenght = resultSendAllLenght,
+                    srcReciveAllLenght = resultReciveAllLenght,
+                    srcReciveSecSpeed = (resultReciveAllLenght - Reverse_NetStatus.srcReciveAllLenght) / (TimerInterval / 1000),
+                    srcSendSecSpeed = (resultSendAllLenght - Reverse_NetStatus.srcSendAllLenght) / (TimerInterval / 1000),
+                    tSendAllLenght = reverselocal.tSendAllLenght,
+                    tReciveAllLenght = reverselocal.tReciveAllLenght,
+                    tSendSecSpeed = (reverselocal.tSendAllLenght - Reverse_NetStatus.tSendAllLenght) / (TimerInterval / 1000),
+                    tReciveSecSpeed = (reverselocal.tReciveAllLenght - Reverse_NetStatus.tReciveAllLenght) / (TimerInterval / 1000),
+                };
+                Reverse_NetStatus = resutnetStatus;
+            }
+
+            OnUpdateStatus?.Invoke(Forward_NetStatus , Reverse_NetStatus);
         }
     }
 }

NoSugarNet.ClientCore/Common/Config.cs

@@ -0,0 +1,17 @@
+using NoSugarNet.Adapter.DataHelper;
+
+namespace NoSugarNet.ClientCore.Common
+{
+    public struct TunnelClientData
+    {
+        public byte TunnelId;
+        public string LocalTargetIP;
+        public ushort LocalTargetPort;
+        public ushort RemoteLocalPort;
+    }
+    public static class Config
+    {
+        public static Dictionary<byte, TunnelClientData> cfgs = new Dictionary<byte, TunnelClientData>();
+        public static E_CompressAdapter compressAdapterType;
+    }
+}

NoSugarNet.ClientCore/Manager/AppForwardLocalClient.cs

@@ -11,24 +11,22 @@ using System.Net;
 
 namespace ServerCore.Manager
 {
-    public class AppLocalClient
+    public class AppForwardLocalClient
     {
         Dictionary<byte, Protobuf_Cfgs_Single> mDictTunnelID2Cfg = new Dictionary<byte, Protobuf_Cfgs_Single>();
         Dictionary<byte, ForwardLocalListener> mDictTunnelID2Listeners = new Dictionary<byte, ForwardLocalListener>();
-        NoSugarNet.Adapter.DataHelper.CompressAdapter mCompressAdapter;
         NoSugarNet.Adapter.DataHelper.E_CompressAdapter compressAdapterType;
-        //public LocalMsgQueuePool _localMsgPool = new LocalMsgQueuePool(1000);
 
         public long tReciveAllLenght { get; private set; }
         public long tSendAllLenght { get; private set; }
 
-        public AppLocalClient()
+        public AppForwardLocalClient()
         {
             //注册网络消息
-            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdCfgs, Recive_CmdCfgs);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdServerCfgs, Recive_CmdCfgs);
-            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CConnect, Recive_TunnelS2CConnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CForwardConnect, Recive_TunnelS2CConnect);
-            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CDisconnect, Recive_TunnelS2CDisconnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CForwardDisconnect, Recive_TunnelS2CDisconnect);
-            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CData, Recive_TunnelS2CData);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CForwardData, Recive_TunnelS2CData);
         }
 
         public void GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght)
@@ -75,11 +73,11 @@ namespace ServerCore.Manager
         void InitListenerMode()
         {
             AppNoSugarNet.log.Info("初始化压缩适配器" + compressAdapterType);
-            //初始化压缩适配器，代表压缩类型
+            ////初始化压缩适配器，代表压缩类型
-            mCompressAdapter = new NoSugarNet.Adapter.DataHelper.CompressAdapter(compressAdapterType);
+            //mCompressAdapter = new NoSugarNet.Adapter.DataHelper.CompressAdapter(compressAdapterType);
             foreach (var cfg in mDictTunnelID2Cfg)
             {
-                ForwardLocalListener listener = new ForwardLocalListener(256, 1024, cfg.Key);
+                ForwardLocalListener listener = new ForwardLocalListener(256, 1024, cfg.Key,AppNoSugarNet.user.userdata.UID);
                 AppNoSugarNet.log.Info($"开始监听配置 Tunnel:{cfg.Key},Port:{cfg.Value.Port}");
                 listener.BandEvent(AppNoSugarNet.log.Log, OnClientLocalConnect, OnClientLocalDisconnect, OnClientTunnelDataCallBack);
                 listener.StartListener((uint)cfg.Value.Port);
@@ -149,7 +147,7 @@ namespace ServerCore.Manager
         #region 解析服务端下行数据
         public void Recive_CmdCfgs(byte[] reqData)
         {
-            AppNoSugarNet.log.Debug("Recive_CmdCfgs");
+            AppNoSugarNet.log.Debug("Forward->Recive_CmdCfgs");
             Protobuf_Cfgs msg = ProtoBufHelper.DeSerizlize<Protobuf_Cfgs>(reqData);
 
             for (int i = 0;i < msg.Cfgs.Count;i++) 
@@ -162,24 +160,23 @@ namespace ServerCore.Manager
         }
         public void Recive_TunnelS2CConnect(byte[] reqData)
         {
-            AppNoSugarNet.log.Debug("Recive_TunnelS2CConnect");
+            AppNoSugarNet.log.Debug("Forward->Recive_TunnelS2CConnect");
-            Protobuf_S2C_Connect msg = ProtoBufHelper.DeSerizlize<Protobuf_S2C_Connect>(reqData);
+            Protobuf_Tunnel_Connect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Connect>(reqData);
             if(msg.Connected == 1)
-                OnServerLocalConnect((byte)msg.TunnelID,(byte)msg.Idx);
+                OnRemoteLocalConnect((byte)msg.TunnelID,(byte)msg.Idx);
             else
-                OnServerLocalDisconnect((byte)msg.TunnelID, (byte)msg.Idx);
+                OnRemoteLocalDisconnect((byte)msg.TunnelID, (byte)msg.Idx);
         }
         public void Recive_TunnelS2CDisconnect(byte[] reqData)
         {
-            AppNoSugarNet.log.Debug("Recive_TunnelS2CDisconnect");
+            AppNoSugarNet.log.Debug("Forward->Recive_TunnelS2CDisconnect");
-            Protobuf_S2C_Disconnect msg = ProtoBufHelper.DeSerizlize<Protobuf_S2C_Disconnect>(reqData);
+            Protobuf_Tunnel_Disconnect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Disconnect>(reqData);
-            OnServerLocalDisconnect((byte)msg.TunnelID,(byte)msg.Idx);
+            OnRemoteLocalDisconnect((byte)msg.TunnelID,(byte)msg.Idx);
         }
         public void Recive_TunnelS2CData(byte[] reqData)
         {
-            //AppNoSugarNet.log.Debug("Recive_TunnelS2CData");
+            Protobuf_Tunnel_DATA msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_DATA>(reqData);
-            Protobuf_S2C_DATA msg = ProtoBufHelper.DeSerizlize<Protobuf_S2C_DATA>(reqData);
+            OnRemoteLocalDataCallBack((byte)msg.TunnelID,(byte)msg.Idx, msg.HunterNetCoreData.ToArray());
-            OnServerLocalDataCallBack((byte)msg.TunnelID,(byte)msg.Idx, msg.HunterNetCoreData.ToArray());
         }
         #endregion
 
@@ -189,50 +186,50 @@ namespace ServerCore.Manager
         /// </summary>
         /// <param name="uid"></param>
         /// <param name="tunnelId"></param>
-        public void OnClientLocalConnect(byte tunnelId,byte _Idx)
+        public void OnClientLocalConnect(long UID, byte tunnelId,byte _Idx)
         {
-            AppNoSugarNet.log.Debug($"OnClientLocalConnect {tunnelId},{_Idx}");
+            AppNoSugarNet.log.Debug($"Forward->OnClientLocalConnect {tunnelId},{_Idx}");
             if (!mDictTunnelID2Cfg.ContainsKey(tunnelId))
                 return;
 
-            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_C2S_Connect()
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Connect()
             {
                 TunnelID = tunnelId,
                 Idx = _Idx,
             });
             
             //告知给服务端，来自客户端本地的连接建立
-            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SConnect, respData);
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SForwardConnect, respData);
         }
         /// <summary>
         /// 当客户端本地端口连接断开
         /// </summary>
         /// <param name="uid"></param>
         /// <param name="tunnelId"></param>
-        public void OnClientLocalDisconnect(byte tunnelId, byte _Idx)
+        public void OnClientLocalDisconnect(long UID, byte tunnelId, byte _Idx)
         {
-            AppNoSugarNet.log.Debug($"OnClientLocalDisconnect {tunnelId},{_Idx}");
+            AppNoSugarNet.log.Debug($"Forward->OnClientLocalDisconnect {tunnelId},{_Idx}");
             //隧道ID定位投递服务端本地连接
             if (!mDictTunnelID2Cfg.ContainsKey(tunnelId))
                 return;
 
-            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_C2S_Disconnect()
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Disconnect()
             {
                 TunnelID = tunnelId,
                 Idx= _Idx,
             });
 
             //告知给服务端，来自客户端本地的连接断开
-            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SDisconnect, respData);
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SForwardDisconnect, respData);
         }
 
         /// <summary>
         /// 当服务端本地端口连接
         /// </summary>
         /// <param name="tunnelId"></param>
-        public void OnServerLocalConnect(byte tunnelId,byte Idx)
+        public void OnRemoteLocalConnect(byte tunnelId,byte Idx)
         {
-            AppNoSugarNet.log.Debug($"OnServerLocalConnect {tunnelId},{Idx}");
+            AppNoSugarNet.log.Debug($"Forward->OnRemoteLocalConnect {tunnelId},{Idx}");
             if (!GetLocalListener(tunnelId, out ForwardLocalListener _listener))
                 return;
             //维护状态
@@ -243,9 +240,9 @@ namespace ServerCore.Manager
                 {
                     IdxWithMsg msg = msglist[i];
                     //投递给服务端，来自客户端本地的连接数据
-                    AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SData, msg.data);
+                    AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SForwardData, msg.data);
                     //发送后回收
-                    LocalMsgQueuePool._localMsgPool.Enqueue(msg);
+                    MsgQueuePool._MsgPool.Enqueue(msg);
                 }
             }
         }
@@ -254,9 +251,9 @@ namespace ServerCore.Manager
         /// </summary>
         /// <param name="uid"></param>
         /// <param name="tunnelId"></param>
-        public void OnServerLocalDisconnect(byte tunnelId, byte Idx)
+        public void OnRemoteLocalDisconnect(byte tunnelId, byte Idx)
         {
-            AppNoSugarNet.log.Debug($"OnServerLocalDisconnect {tunnelId},{Idx}");
+            AppNoSugarNet.log.Debug($"Forward->OnRemoteLocalDisconnect {tunnelId},{Idx}");
             if (!GetLocalListener(tunnelId, out ForwardLocalListener _listener))
                 return;
             _listener.SetRemoteConnectd(Idx,false);
@@ -271,15 +268,15 @@ namespace ServerCore.Manager
         /// <param name="uid"></param>
         /// <param name="tunnelId"></param>
         /// <param name="data"></param>
-        public void OnServerLocalDataCallBack(byte tunnelId,byte Idx, byte[] data)
+        public void OnRemoteLocalDataCallBack(byte tunnelId,byte Idx, byte[] data)
         {
-            //AppNoSugarNet.log.Info($"OnServerLocalDataCallBack {tunnelId},{Idx},Data长度：{data.Length}");
+            //AppNoSugarNet.log.Info($"OnRemoteLocalDataCallBack {tunnelId},{Idx},Data长度：{data.Length}");
             if (!GetLocalListener(tunnelId, out ForwardLocalListener _listener))
                 return;
             //记录压缩前数据长度
             tReciveAllLenght += data.Length;
             //解压
-            data = mCompressAdapter.Decompress(data);
+            data = CompressAdapterSelector.Adapter(compressAdapterType).Decompress(data);
             _listener.SendSocketByIdx(Idx,data);
         }
         /// <summary>
@@ -288,7 +285,7 @@ namespace ServerCore.Manager
         /// <param name="uid"></param>
         /// <param name="tunnelId"></param>
         /// <param name="data"></param>
-        public void OnClientTunnelDataCallBack(byte tunnelId,byte Idx, byte[] data)
+        public void OnClientTunnelDataCallBack(long UID, byte tunnelId,byte Idx, byte[] data)
         {
             //AppNoSugarNet.log.Info($"OnClientTunnelDataCallBack {tunnelId},{Idx} data.Length->{data.Length}");
 
@@ -322,11 +319,11 @@ namespace ServerCore.Manager
         void SendDataToRemote(byte tunnelId, byte Idx, byte[] data)
         {
             //压缩
-            data = mCompressAdapter.Compress(data);
+            data = CompressAdapterSelector.Adapter(compressAdapterType).Compress(data);
             //记录压缩后数据长度
             tSendAllLenght += data.Length;
 
-            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_C2S_DATA()
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_DATA()
             {
                 TunnelID = tunnelId,
                 Idx = Idx,
@@ -343,7 +340,7 @@ namespace ServerCore.Manager
                 return;
             }
             //投递给服务端，来自客户端本地的连接数据
-            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SData, respData);
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SForwardData, respData);
         }
         #endregion
 

NoSugarNet.ClientCore/Manager/AppLogin.cs

@@ -33,13 +33,13 @@ namespace NoSugarNet.ClientCore.Manager
             if (msg.Status == LoginResultStatus.Ok)
             {
                 AppNoSugarNet.log.Info("登录成功");
-                AppNoSugarNet.user.InitMainUserData(AppNoSugarNet.user.userdata.Account);
+                AppNoSugarNet.user.InitMainUserData(AppNoSugarNet.user.userdata.Account,msg.UID);
+                AppNoSugarNet.reverselocal.Send_ClientCfg();
             }
             else
             {
                 AppNoSugarNet.log.Info("登录失败");
             }
         }
-
     }
 }

NoSugarNet.ClientCore/Manager/AppReverseLocalClient.cs

@@ -0,0 +1,361 @@
+using AxibugProtobuf;
+using Google.Protobuf;
+using NoSugarNet.Adapter;
+using NoSugarNet.Adapter.DataHelper;
+using NoSugarNet.ClientCore;
+using NoSugarNet.ClientCore.Common;
+using NoSugarNet.ClientCore.Network;
+
+namespace ServerCore.Manager
+{
+    public class AppReverseLocalClient
+    {
+        Dictionary<long, BackwardLocalClient> mDictCommKey2LocalClients = new Dictionary<long, BackwardLocalClient>();
+        NoSugarNet.Adapter.DataHelper.CompressAdapter mCompressAdapter;
+        //public LocalMsgQueuePool _localMsgPool = new LocalMsgQueuePool(1000);
+
+        public long tReciveAllLenght { get; private set; }
+        public long tSendAllLenght { get; private set; }
+
+        Protobuf_Cfgs _Send_Protobuf_Cfgs = new Protobuf_Cfgs();
+
+        static long GetCommKey(long Uid, int Tunnel, int Idx)
+        {
+            return (Uid * 10000000) + (Tunnel * 10000) + Idx;
+        }
+
+        static long GetUidForCommKey(long CommKey)
+        {
+            return CommKey / 10000000;
+        }
+
+        public AppReverseLocalClient(NoSugarNet.Adapter.DataHelper.E_CompressAdapter compressAdapterType)
+        {
+            AppNoSugarNet.log.Debug("Reverse->初始化压缩适配器" + compressAdapterType);
+            //初始化压缩适配器，暂时使用0，代表压缩类型
+            mCompressAdapter = new CompressAdapter(compressAdapterType);
+
+            //注册网络消息
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CReverseConnect, Recive_TunnelS2CConnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CReverseDisconnect, Recive_TunnelS2CDisconnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelS2CReverseData, Recive_TunnelS2CData);
+        }
+
+        public void GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght)
+        {
+            resultReciveAllLenght = 0;
+            resultSendAllLenght = 0;
+            long[] Keys = mDictCommKey2LocalClients.Keys.ToArray();
+            for (int i = 0; i < Keys.Length; i++)
+            {
+                //local和转发 收发相反
+                resultSendAllLenght += mDictCommKey2LocalClients[Keys[i]].mReciveAllLenght;
+                resultReciveAllLenght += mDictCommKey2LocalClients[Keys[i]].mSendAllLenght;
+            }
+        }
+
+        public void Send_ClientCfg()
+        {
+            AppNoSugarNet.log.Debug("Reverse->-->Send_ClientCfg");
+
+            _Send_Protobuf_Cfgs.CompressAdapterType = (int)Config.compressAdapterType;
+            _Send_Protobuf_Cfgs.Cfgs.Clear();
+            foreach (var cfg in Config.cfgs)
+            {
+                _Send_Protobuf_Cfgs.Cfgs.Add(new Protobuf_Cfgs_Single() { Port = cfg.Value.RemoteLocalPort, TunnelID = cfg.Value.TunnelId });
+            }
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdClientCfgs, ProtoBufHelper.Serizlize(_Send_Protobuf_Cfgs));
+        }
+
+
+        #region 解析服务端下行数据
+        public void Recive_TunnelS2CConnect(byte[] reqData)
+        {
+            AppNoSugarNet.log.Debug("Reverse->Recive_TunnelS2CConnect");
+            Protobuf_Tunnel_Connect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Connect>(reqData);
+            if (msg.Connected == 1)
+                OnRemoteLocalConnect((byte)msg.TunnelID, (byte)msg.Idx);
+            else
+                OnRemoteLocalDisconnect((byte)msg.TunnelID, (byte)msg.Idx);
+        }
+        public void Recive_TunnelS2CDisconnect(byte[] reqData)
+        {
+            AppNoSugarNet.log.Debug("Reverse->Recive_TunnelS2CDisconnect");
+            Protobuf_Tunnel_Disconnect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Disconnect>(reqData);
+            OnRemoteLocalDisconnect((byte)msg.TunnelID, (byte)msg.Idx);
+        }
+        public void Recive_TunnelS2CData(byte[] reqData)
+        {
+            Protobuf_Tunnel_DATA msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_DATA>(reqData);
+            OnRemoteTunnelDataCallBack(AppNoSugarNet.user.userdata.UID, (byte)msg.TunnelID, (byte)msg.Idx, msg.HunterNetCoreData.ToArray());
+        }
+        #endregion
+
+
+        #region 两端本地端口连接事件通知
+
+        /// <summary>
+        /// 当服务端本地端口连接
+        /// </summary>
+        /// <param name="tunnelId"></param>
+        public void OnRemoteLocalConnect(byte tunnelId, byte Idx)
+        {
+            AppNoSugarNet.log.Debug($"Reverse->OnRemoteLocalConnect{AppNoSugarNet.user.userdata.UID},{tunnelId},{Idx}");
+
+            if (!Config.cfgs.ContainsKey(tunnelId))
+                return;
+
+            //开一个线程去建立连接
+            Thread thread = new Thread(() =>
+            {
+                //服务器本地局域网连接指定端口
+                TunnelClientData tunnelDataCfg = Config.cfgs[tunnelId];
+                BackwardLocalClient serverLocalClient = new BackwardLocalClient(AppNoSugarNet.user.userdata.UID, tunnelId, (byte)Idx);
+                serverLocalClient.BandEvent(AppNoSugarNet.log.Log, OnClientLocalConnect, OnClientLocalDisconnect, OnClientLocalDataCallBack);
+                //连接成功
+                if (!serverLocalClient.Init(tunnelDataCfg.LocalTargetIP, tunnelDataCfg.LocalTargetPort))
+                {
+                    //TODO告知客户端连接失败
+                    byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Connect()
+                    {
+                        TunnelID = tunnelId,
+                        Idx = (uint)Idx,
+                        Connected = 0//失败
+                    });
+                    //发送给客户端，指定服务端本地端口已连接
+                    AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SReverseConnect, respData);
+                }
+            });
+            thread.Start();
+        }
+        /// <summary>
+        /// 当服务端本地端口连接断开
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        public void OnRemoteLocalDisconnect(byte tunnelId, byte Idx)
+        {
+            AppNoSugarNet.log.Debug($"Reverse->OnRemoteLocalDisconnect {AppNoSugarNet.user.userdata.UID},{tunnelId},{Idx}");
+            
+            //隧道ID定位投递服务端本地连接
+            if (!GetClientLocalClient(AppNoSugarNet.user.userdata.UID, tunnelId, Idx, out BackwardLocalClient LocalClient))
+                return;
+
+            //断开服务端本地客户端连接
+            CloseClientLocalClient(AppNoSugarNet.user.userdata.UID, tunnelId, Idx);
+        }
+
+        /// <summary>
+        /// 当服务端本地端口连接
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        public void OnClientLocalConnect(long uid, byte tunnelId, byte Idx, BackwardLocalClient serverLocalClient)
+        {
+            AppNoSugarNet.log.Debug($"Reverse->OnServerLocalConnect {uid},{tunnelId},{Idx}");
+
+            //添加到服务端本地连接列表
+            AddClientLocalClient(uid, tunnelId, Idx, serverLocalClient);
+
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Connect()
+            {
+                TunnelID = tunnelId,
+                Idx = Idx,
+                Connected = 1
+            });
+            //发送给客户端，指定服务端本地端口已连接
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SReverseConnect,  respData);
+        }
+        /// <summary>
+        /// 当服务端本地端口连接断开
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        public void OnClientLocalDisconnect(long uid, byte tunnelId, byte Idx, BackwardLocalClient serverLocalClient)
+        {
+            AppNoSugarNet.log.Debug($"Reverse->OnClientLocalDisconnect {uid},{tunnelId},{Idx}");
+            //移除到服务端本地连接列表
+            RemoveClientLocalClient(uid, tunnelId, Idx);
+
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Disconnect()
+            {
+                TunnelID = tunnelId,
+                Idx = Idx,
+            });
+            //发送给客户端，指定服务端本地端口连接已断开
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SReverseDisconnect,  respData);
+        }
+        #endregion
+
+        #region 连接字典管理
+        /// <summary>
+        /// 追加连接
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        /// <param name="serverClient"></param>
+        void AddClientLocalClient(long uid, byte tunnelId, byte Idx, BackwardLocalClient serverClient)
+        {
+            long CommKey = GetCommKey(uid, tunnelId, Idx);
+            lock (mDictCommKey2LocalClients)
+            {
+                mDictCommKey2LocalClients[CommKey] = serverClient;
+            }
+        }
+        /// <summary>
+        /// 删除连接
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        void RemoveClientLocalClient(long uid, byte tunnelId, byte Idx)
+        {
+            lock (mDictCommKey2LocalClients)
+            {
+                long CommKey = GetCommKey(uid, tunnelId, Idx);
+
+                if (!mDictCommKey2LocalClients.ContainsKey(CommKey))
+                    return;
+                mDictCommKey2LocalClients[CommKey].Release();
+                mDictCommKey2LocalClients.Remove(CommKey);
+            }
+        }
+
+        bool GetClientLocalClient(long uid, byte tunnelId, byte Idx, out BackwardLocalClient serverLocalClient)
+        {
+            serverLocalClient = null;
+
+            long CommKey = GetCommKey(uid, tunnelId, Idx);
+
+            if (!mDictCommKey2LocalClients.ContainsKey(CommKey))
+                return false;
+
+            serverLocalClient = mDictCommKey2LocalClients[CommKey];
+            return true;
+        }
+
+        void CloseClientLocalClient(long uid, byte tunnelId, byte Idx)
+        {
+            //隧道ID定位投递服务端本地连接
+            if (!GetClientLocalClient(uid, tunnelId, Idx, out BackwardLocalClient _LocalClient))
+                return;
+            _LocalClient.CloseConntect();
+            RemoveClientLocalClient(uid, tunnelId, Idx);
+        }
+
+        public void GetClientCount(out int ClientUserCount, out int TunnelCount)
+        {
+            TunnelCount = mDictCommKey2LocalClients.Count;
+            long[] CommIDKeys = mDictCommKey2LocalClients.Keys.ToArray();
+            List<long> TempHadLocalConnetList = new List<long>();
+            for (int i = 0; i < CommIDKeys.Length; i++)
+            {
+                long uid = GetUidForCommKey(CommIDKeys[i]);
+                if (!TempHadLocalConnetList.Contains(uid))
+                    TempHadLocalConnetList.Add(uid);
+            }
+            ClientUserCount = TempHadLocalConnetList.Count;
+        }
+
+        public void StopAll(long Uid)
+        {
+            List<long> TempRemoveCommIDList = new List<long>();
+            lock (mDictCommKey2LocalClients)
+            {
+                long[] CommIDKeys = mDictCommKey2LocalClients.Keys.ToArray();
+                for (int i = 0; i < CommIDKeys.Length; i++)
+                {
+                    long CommID = CommIDKeys[i];
+                    long tempUid = GetUidForCommKey(CommID);
+                    if (tempUid == Uid)
+                        TempRemoveCommIDList.Add(CommID);
+                }
+            }
+
+            for (int i = 0; i < TempRemoveCommIDList.Count; i++)
+            {
+                long CommID = TempRemoveCommIDList[i];
+                if (!mDictCommKey2LocalClients.ContainsKey(CommID))
+                    continue;
+                BackwardLocalClient _serverLoackClient = mDictCommKey2LocalClients[CommID];
+                _serverLoackClient.CloseConntect();
+            }
+        }
+        #endregion
+
+
+        #region 数据投递
+        /// <summary>
+        /// 来自客户端本地连接投递的Tunnel数据
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        /// <param name="data"></param>
+        public void OnRemoteTunnelDataCallBack(long uid, byte tunnelId, byte Idx, byte[] data)
+        {
+            //隧道ID定位投递服务端本地连接
+            if (!GetClientLocalClient(uid, tunnelId, Idx, out BackwardLocalClient serverLocalClient))
+                return;
+            //记录数据长度
+            tReciveAllLenght += data.Length;
+            //解压
+            data = mCompressAdapter.Decompress(data);
+            //记录数据长度
+            serverLocalClient.mSendAllLenght += data.LongLength;
+            //发送给对应服务端本地连接数据
+            serverLocalClient.SendToServer(data);
+        }
+        /// <summary>
+        /// 来自服务端本地连接投递的Tunnel数据
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        /// <param name="data"></param>
+        public void OnClientLocalDataCallBack(long uid, byte tunnelId, byte Idx, byte[] data)
+        {
+            //AppNoSugarNet.log.Debug($"Reverse->OnClientLocalDataCallBack {uid},{tunnelId},{Idx},data -> {data.Length}");
+            int SlienLenght = 1000;
+            //判断数据量大时分包
+            if (data.Length > SlienLenght)
+            {
+                Span<byte> tempSpan = data;
+                Span<byte> tempSpanSlien = null;
+                int PageCount = (int)(data.Length / SlienLenght);
+                if (data.Length % SlienLenght > 0)
+                {
+                    PageCount++;
+                }
+
+                for (int i = 0; i < PageCount; i++)
+                {
+                    int StartIdx = i * SlienLenght;
+                    if (i != PageCount - 1)//不是最后一个包
+                        tempSpanSlien = tempSpan.Slice(StartIdx, SlienLenght);
+                    else//最后一个
+                        tempSpanSlien = tempSpan.Slice(StartIdx);
+
+                    SendDataToRemote(uid, tunnelId, Idx, tempSpanSlien.ToArray());
+                }
+                return;
+            }
+            SendDataToRemote(uid, tunnelId, Idx, data);
+        }
+        void SendDataToRemote(long uid, byte tunnelId, byte Idx, byte[] data)
+        {
+            //压缩
+            data = mCompressAdapter.Compress(data);
+            //记录压缩后数据长度
+            tSendAllLenght += data.Length;
+
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_DATA()
+            {
+                TunnelID = tunnelId,
+                Idx = Idx,
+                HunterNetCoreData = ByteString.CopyFrom(data)
+            });
+
+            //发送给客户端，指定客户端本地隧道ID
+            AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SReverseData, respData);
+        }
+        #endregion
+    }
+}

NoSugarNet.ClientCore/Manager/UserDataManager.cs

@@ -23,10 +23,11 @@ namespace NoSugarNet.ClientCore.Manager
         public MainUserDataBase userdata { get;private set; } = new MainUserDataBase();
         public bool IsLoggedIn => userdata.IsLoggedIn;
 
-        public void InitMainUserData(string UName)
+        public void InitMainUserData(string UName,long UID)
         {
             userdata.Account = UName;
             userdata.IsLoggedIn = true;
+            userdata.UID = UID;
             //以及其他数据初始化
             //...
         }

NoSugarNet.ClientCore/Network/NetworkHelper.cs

@@ -57,7 +57,7 @@ namespace NoSugarNet.ClientCore.Network
                 NetworkDeBugLog("连接失败！");
 
                 //停止所有
-                AppNoSugarNet.local.StopAll();
+                AppNoSugarNet.forwardlocal.StopAll();
 
                 //自动重连开关
                 if (bAutoReConnect)
@@ -100,7 +100,8 @@ namespace NoSugarNet.ClientCore.Network
             NetworkDeBugLog("OnConnectClose");
 
             //停止所有
-            AppNoSugarNet.local.StopAll();
+            AppNoSugarNet.forwardlocal.StopAll();
+            AppNoSugarNet.reverselocal.StopAll(AppNoSugarNet.user.userdata.UID);
 
             //自动重连开关
             if (bAutoReConnect)

NoSugarNet.DataHelper/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <PublishDir>F:\Sin365\NoSugarNet\Lib\NetLib_Standard2</PublishDir>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <_TargetId>Folder</_TargetId>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+</Project>

NoSugarNet.DataHelper/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <History>True|2024-04-15T06:43:38.1978223Z;True|2024-04-15T14:42:22.9030158+08:00;True|2024-04-15T14:10:55.2191388+08:00;True|2024-04-15T14:07:27.2723988+08:00;False|2024-04-15T14:07:03.8682886+08:00;False|2024-04-15T14:06:57.0680795+08:00;</History>
+    <LastFailureDetails />
+  </PropertyGroup>
+</Project>

NoSugarNet.ServerCore/Manager/ClientManager.cs

@@ -12,6 +12,10 @@ namespace ServerCore.Manager
         public bool IsOffline { get; set; } = false;
         public DateTime LogOutDT { get; set; }
 
+        public NoSugarNet.Adapter.DataHelper.E_CompressAdapter e_CompressAdapter { get; set; }
+
+        public Dictionary<byte, Protobuf_Cfgs_Single> _cfgs { get; set; }
+
     }
 
     public class ClientManager
@@ -85,6 +89,15 @@ namespace ServerCore.Manager
             return cinfo;
         }
 
+        public void SetUserCfg(long uid, NoSugarNet.Adapter.DataHelper.E_CompressAdapter CompressAdapter, Dictionary<byte, Protobuf_Cfgs_Single> cfg)
+        {
+            if (GetClientByUID(uid, out ClientInfo _c))
+            {
+                _c._cfgs = cfg;
+                _c.e_CompressAdapter = CompressAdapter;
+            }
+        }
+
         /// <summary>
         /// 增加用户
         /// </summary>
@@ -174,7 +187,8 @@ namespace ServerCore.Manager
             cinfo.IsOffline = true;
             cinfo.LogOutDT = DateTime.Now;
             //断开所有连接
-            ServerManager.g_Local.StopAll(cinfo.UID);
+            ServerManager.g_ForwardLocal.StopAllByUid(cinfo.UID);
+            ServerManager.g_ReverseLocal.StopAllByUid(cinfo.UID);
         }
 
         public void RemoveClientForSocket(Socket sk)

NoSugarNet.ServerCore/Manager/ForwardLocalClientManager.cs

@@ -9,10 +9,11 @@ using System.Net.Sockets;
 
 namespace ServerCore.Manager
 {
-    public class LocalClientManager
+    public class ForwardLocalClientManager
     {
         Dictionary<long, BackwardLocalClient> mDictCommKey2ServerLocalClients = new Dictionary<long, BackwardLocalClient>();
-        CompressAdapter mCompressAdapter;
+        E_CompressAdapter compressAdapterType;
+        //CompressAdapter mCompressAdapter;
 
         public long tReciveAllLenght { get; private set; }
         public long tSendAllLenght { get;private set; }
@@ -27,15 +28,14 @@ namespace ServerCore.Manager
             return CommKey / 10000000;
         }
 
-        public LocalClientManager(E_CompressAdapter compressAdapterType)
+        public ForwardLocalClientManager(E_CompressAdapter _compressAdapterType)
         {
-            ServerManager.g_Log.Debug("初始化压缩适配器" + compressAdapterType);
+            ServerManager.g_Log.Debug("初始化压缩适配器" + _compressAdapterType);
-            //初始化压缩适配器，暂时使用0，代表压缩类型
+            compressAdapterType = _compressAdapterType;
-            mCompressAdapter = new CompressAdapter(compressAdapterType);
             //注册网络消息
-            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelC2SConnect, Recive_TunnelC2SConnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelC2SForwardConnect, Recive_TunnelC2SConnect);
-            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelC2SDisconnect, Recive_TunnelC2SDisconnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelC2SForwardDisconnect, Recive_TunnelC2SDisconnect);
-            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelC2SData, Recive_TunnelC2SData);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelC2SForwardData, Recive_TunnelC2SData);
         }
 
         public void GetCurrLenght(out long resultReciveAllLenght,out long resultSendAllLenght)
@@ -120,7 +120,7 @@ namespace ServerCore.Manager
             ClientUserCount = TempHadLocalConnetList.Count;
         }
 
-        public void StopAll(long Uid)
+        public void StopAllByUid(long Uid)
         {
             List<long> TempRemoveCommIDList = new List<long>();
             lock (mDictCommKey2ServerLocalClients)
@@ -151,21 +151,21 @@ namespace ServerCore.Manager
         {
             ClientInfo _c = ServerManager.g_ClientMgr.GetClientForSocket(sk);
             ServerManager.g_Log.Debug("OnTunnelC2SConnect");
-            Protobuf_C2S_Connect msg = ProtoBufHelper.DeSerizlize<Protobuf_C2S_Connect>(reqData);
+            Protobuf_Tunnel_Connect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Connect>(reqData);
             OnClientLocalConnect(_c.UID, (byte)msg.TunnelID, (byte)msg.Idx);
         }
         public void Recive_TunnelC2SDisconnect(Socket sk, byte[] reqData)
         {
             ClientInfo _c = ServerManager.g_ClientMgr.GetClientForSocket(sk);
             ServerManager.g_Log.Debug("Recive_TunnelC2SDisconnect");
-            Protobuf_C2S_Disconnect msg = ProtoBufHelper.DeSerizlize<Protobuf_C2S_Disconnect>(reqData);
+            Protobuf_Tunnel_Disconnect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Disconnect>(reqData);
             OnClientLocalDisconnect(_c.UID, (byte)msg.TunnelID,(byte)msg.Idx);
         }
         public void Recive_TunnelC2SData(Socket sk, byte[] reqData)
         {
             ClientInfo _c = ServerManager.g_ClientMgr.GetClientForSocket(sk);
             //ServerManager.g_Log.Debug("OnTunnelC2SData");
-            Protobuf_C2S_DATA msg = ProtoBufHelper.DeSerizlize<Protobuf_C2S_DATA>(reqData);
+            Protobuf_Tunnel_DATA msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_DATA>(reqData);
             OnClientTunnelDataCallBack(_c.UID, (byte)msg.TunnelID, (byte)msg.Idx, msg.HunterNetCoreData.ToArray());
         }
         #endregion
@@ -197,14 +197,14 @@ namespace ServerCore.Manager
                 {
                     //TODO告知客户端连接失败
 
-                    byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_S2C_Connect()
+                    byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Connect()
                     {
                         TunnelID = tunnelId,
                         Idx = (uint)Idx,
                         Connected = 0//失败
                     });
                     //发送给客户端，指定服务端本地端口已连接
-                    ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CConnect, (int)ErrorCode.ErrorOk, respData);
+                    ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CForwardConnect, (int)ErrorCode.ErrorOk, respData);
                 }
             });
             thread.Start();
@@ -241,14 +241,14 @@ namespace ServerCore.Manager
             //添加到服务端本地连接列表
             AddServerLocalClient(uid, tunnelId, Idx, serverLocalClient);
 
-            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_S2C_Connect()
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Connect()
             {
                 TunnelID = tunnelId,
                 Idx = Idx,
                 Connected = 1
             });
             //发送给客户端，指定服务端本地端口已连接
-            ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CConnect, (int)ErrorCode.ErrorOk, respData);
+            ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CForwardConnect, (int)ErrorCode.ErrorOk, respData);
         }
         /// <summary>
         /// 当服务端本地端口连接断开
@@ -263,13 +263,13 @@ namespace ServerCore.Manager
             //移除到服务端本地连接列表
             RemoveServerLocalClient(uid, tunnelId, Idx);
 
-            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_S2C_Disconnect()
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Disconnect()
             {
                 TunnelID = tunnelId,
                 Idx= Idx,
             });
             //发送给客户端，指定服务端本地端口连接已断开
-            ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CDisconnect, (int)ErrorCode.ErrorOk, respData);
+            ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CForwardDisconnect, (int)ErrorCode.ErrorOk, respData);
         }
         #endregion
 
@@ -289,7 +289,7 @@ namespace ServerCore.Manager
             //记录数据长度
             tReciveAllLenght += data.Length;
             //解压
-            data = mCompressAdapter.Decompress(data);
+            data = CompressAdapterSelector.Adapter(compressAdapterType).Decompress(data);
             //记录数据长度
             serverLocalClient.mSendAllLenght += data.LongLength;
             //发送给对应服务端本地连接数据
@@ -339,11 +339,11 @@ namespace ServerCore.Manager
                 return;
 
             //压缩
-            data = mCompressAdapter.Compress(data);
+            data = CompressAdapterSelector.Adapter(compressAdapterType).Compress(data);
             //记录压缩后数据长度
             tSendAllLenght += data.Length;
 
-            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_S2C_DATA()
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_DATA()
             {
                 TunnelID = tunnelId,
                 Idx = Idx,
@@ -351,7 +351,7 @@ namespace ServerCore.Manager
             });
 
             //发送给客户端，指定客户端本地隧道ID
-            ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CData, (int)ErrorCode.ErrorOk, respData);
+            ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CForwardData, (int)ErrorCode.ErrorOk, respData);
         }
         #endregion
     }

NoSugarNet.ServerCore/Manager/LogManager.cs

@@ -2,6 +2,10 @@
 {
     public class LogManager
     {
+        public void Info(string str)
+        {
+            Console.WriteLine(str);
+        }
         public void Debug(string str)
         {
             Console.WriteLine(str);

NoSugarNet.ServerCore/Manager/LoginManager.cs

@@ -24,7 +24,8 @@ namespace ServerCore.Manager
                 Status = LoginResultStatus.Ok,
                 RegDate = "",
                 LastLoginDate = "",
-                Token = ""
+                Token = "",
+                UID = cinfo.UID
             });
 
             ServerManager.g_ClientMgr.ClientSend(cinfo, (int)CommandID.CmdLogin, (int)ErrorCode.ErrorOk, respData);
@@ -39,7 +40,7 @@ namespace ServerCore.Manager
             cfgsSP.CompressAdapterType = (int)Config.compressAdapterType;
 
             byte[] respDataCfg = ProtoBufHelper.Serizlize(cfgsSP);
-            ServerManager.g_ClientMgr.ClientSend(cinfo, (int)CommandID.CmdCfgs, (int)ErrorCode.ErrorOk, respDataCfg);
+            ServerManager.g_ClientMgr.ClientSend(cinfo, (int)CommandID.CmdServerCfgs, (int)ErrorCode.ErrorOk, respDataCfg);
         }
     }
 }

NoSugarNet.ServerCore/Manager/ReverseLocalClientManager.cs

@@ -0,0 +1,382 @@
+using AxibugProtobuf;
+using Google.Protobuf;
+using NoSugarNet.Adapter;
+using NoSugarNet.Adapter.DataHelper;
+using NoSugarNet.ServerCore.Common;
+using ServerCore.Common;
+using ServerCore.NetWork;
+using System.Net.Sockets;
+
+namespace ServerCore.Manager
+{
+    public class ReverseLocalClientManager
+    {
+        Dictionary<long, ForwardLocalListener> mDictCommKey2LocalListeners = new Dictionary<long, ForwardLocalListener>();
+
+        public long tReciveAllLenght { get; private set; }
+        public long tSendAllLenght { get; private set; }
+
+        static long GetCommKey(long Uid, int Tunnel)
+        {
+            return (Uid * 10000000) + (Tunnel * 10000);
+        }
+
+        static long GetUidForCommKey(long CommKey)
+        {
+            return CommKey / 10000000;
+        }
+
+        public void GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght)
+        {
+            resultReciveAllLenght = 0;
+            resultSendAllLenght = 0;
+            long[] Keys = mDictCommKey2LocalListeners.Keys.ToArray();
+            for (int i = 0; i < Keys.Length; i++)
+            {
+                //local和转发 收发相反
+                resultSendAllLenght += mDictCommKey2LocalListeners[Keys[i]].mReciveAllLenght;
+                resultReciveAllLenght += mDictCommKey2LocalListeners[Keys[i]].mSendAllLenght;
+            }
+        }
+
+        public void GetClientCount(out int ClientUserCount, out int TunnelCount)
+        {
+            TunnelCount = mDictCommKey2LocalListeners.Count;
+            long[] CommIDKeys = mDictCommKey2LocalListeners.Keys.ToArray();
+            List<long> TempHadLocalConnetList = new List<long>();
+            for (int i = 0; i < CommIDKeys.Length; i++)
+            {
+                long uid = GetUidForCommKey(CommIDKeys[i]);
+                if (!TempHadLocalConnetList.Contains(uid))
+                    TempHadLocalConnetList.Add(uid);
+            }
+            ClientUserCount = TempHadLocalConnetList.Count;
+        }
+
+        public ReverseLocalClientManager()
+        {
+            //注册网络消息
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdClientCfgs, Recive_CmdCfgs);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelC2SReverseConnect, Recive_TunnelC2SConnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelC2SReverseDisconnect, Recive_TunnelC2SDisconnect);
+            NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdTunnelC2SReverseData, Recive_TunnelC2SData);
+        }
+
+        /// <summary>
+        /// 初始化连接
+        /// </summary>
+        void InitListenerMode(long UID)
+        {
+            if (!ServerManager.g_ClientMgr.GetClientByUID(UID, out ClientInfo _c))
+                return;
+
+            //初始化压缩适配器，代表压缩类型
+            ServerManager.g_Log.Info("初始化压缩适配器" + _c.e_CompressAdapter);
+            foreach (var cfg in _c._cfgs)
+            {
+                ForwardLocalListener listener = new ForwardLocalListener(256, 1024, cfg.Key, UID);
+                ServerManager.g_Log.Info($"开始监听配置 Tunnel:{cfg.Key},Port:{cfg.Value.Port}");
+                listener.BandEvent(ServerManager.g_Log.Log, OnLocalConnect, OnLocalDisconnect, OnTunnelDataCallBack);
+                listener.StartListener((uint)cfg.Value.Port);
+                AddLocalListener(UID, listener);
+            }
+        }
+
+        #region 连接字典管理
+        /// <summary>
+        /// 追加监听者
+        /// </summary>
+        /// <param name="tunnelId"></param>
+        /// <param name="serverClient"></param>
+        void AddLocalListener(long UID, ForwardLocalListener _listener)
+        {
+            long Key = GetCommKey(UID, _listener.mTunnelID);
+            lock (mDictCommKey2LocalListeners)
+            {
+                mDictCommKey2LocalListeners[Key] = _listener;
+            }
+        }
+        /// <summary>
+        /// 删除监听
+        /// </summary>
+        /// <param name="tunnelId"></param>
+        /// <param name="serverClient"></param>
+        void RemoveLocalListener(long UID, ForwardLocalListener _listener)
+        {
+            long Key = GetCommKey(UID, _listener.mTunnelID);
+            lock (mDictCommKey2LocalListeners)
+            {
+                if (mDictCommKey2LocalListeners.ContainsKey(Key))
+                    mDictCommKey2LocalListeners.Remove(Key);
+            }
+        }
+        bool GetLocalListener(long UID, byte tunnelId, out ForwardLocalListener _listener)
+        {
+            long Key = GetCommKey(UID, tunnelId);
+            _listener = null;
+            if (!mDictCommKey2LocalListeners.ContainsKey(Key))
+                return false;
+
+            _listener = mDictCommKey2LocalListeners[Key];
+            return true;
+        }
+        public void StopAllByUid(long UID)
+        {
+            lock (mDictCommKey2LocalListeners)
+            {
+                long[] keys = mDictCommKey2LocalListeners.Keys.ToArray();
+                for (int i = 0; i < keys.Length; i++)
+                {
+                    ForwardLocalListener _listener = mDictCommKey2LocalListeners[keys[i]];
+                    if (_listener.mUid != UID)
+                        continue;
+                    _listener.StopAllLocalClient();
+                    _listener.StopWithClear();
+                    //_listener.Stop();
+                    RemoveLocalListener(UID, _listener);
+                }
+                //服务端得按用户分开
+                //mDictCommKey2ServerLocalClients.Clear();
+            }
+        }
+        #endregion
+
+
+        #region 解析客户端下行数据
+        public void Recive_CmdCfgs(Socket sk, byte[] reqData)
+        {
+            ServerManager.g_Log.Debug("Reverse->Recive_CmdCfgs");
+            ClientInfo _c = ServerManager.g_ClientMgr.GetClientForSocket(sk);
+            Protobuf_Cfgs msg = ProtoBufHelper.DeSerizlize<Protobuf_Cfgs>(reqData);
+            Dictionary<byte, Protobuf_Cfgs_Single> tempDictTunnelID2Cfg = new Dictionary<byte, Protobuf_Cfgs_Single>();
+            for (int i = 0; i < msg.Cfgs.Count; i++)
+            {
+                Protobuf_Cfgs_Single cfg = msg.Cfgs[i];
+                tempDictTunnelID2Cfg[(byte)cfg.TunnelID] = cfg;
+            }
+            //设置玩家的设置
+            ServerManager.g_ClientMgr.SetUserCfg(_c.UID, (E_CompressAdapter)msg.CompressAdapterType, tempDictTunnelID2Cfg);
+            InitListenerMode(_c.UID);
+        }
+        public void Recive_TunnelC2SConnect(Socket sk, byte[] reqData)
+        {
+            ServerManager.g_Log.Debug("Reverse->Recive_TunnelC2SConnect");
+            ClientInfo _c = ServerManager.g_ClientMgr.GetClientForSocket(sk);
+            Protobuf_Tunnel_Connect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Connect>(reqData);
+
+            if (msg.Connected == 1)
+                OnRemoteLocalConnect(_c.UID,(byte)msg.TunnelID, (byte)msg.Idx);
+            else
+                OnRemoteLocalDisconnect(_c.UID, (byte)msg.TunnelID, (byte)msg.Idx);
+        }
+        public void Recive_TunnelC2SDisconnect(Socket sk, byte[] reqData)
+        {
+            ServerManager.g_Log.Debug("Reverse->Recive_TunnelC2CDisconnect");
+            ClientInfo _c = ServerManager.g_ClientMgr.GetClientForSocket(sk);
+            Protobuf_Tunnel_Connect msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_Connect>(reqData);
+            OnRemoteLocalDisconnect(_c.UID,(byte)msg.TunnelID, (byte)msg.Idx);
+        }
+        public void Recive_TunnelC2SData(Socket sk, byte[] reqData)
+        {
+            //ServerManager.g_Log.Debug("Reverse->Recive_TunnelC2SData");
+            ClientInfo _c = ServerManager.g_ClientMgr.GetClientForSocket(sk);
+            Protobuf_Tunnel_DATA msg = ProtoBufHelper.DeSerizlize<Protobuf_Tunnel_DATA>(reqData);
+            OnRemoteLocalDataCallBack(_c.UID, (byte)msg.TunnelID, (byte)msg.Idx, msg.HunterNetCoreData.ToArray());
+        }
+        #endregion
+
+
+        #region 两端本地端口连接事件通知
+        /// <summary>
+        /// 当客户端本地端口连接
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        public void OnLocalConnect(long UID, byte tunnelId, byte _Idx)
+        {
+            ServerManager.g_Log.Debug($"Reverse->OnLocalConnect {UID},{tunnelId},{_Idx}");
+            if (!ServerManager.g_ClientMgr.GetClientByUID(UID, out ClientInfo client))
+                return;
+            if (!GetLocalListener(UID, tunnelId, out ForwardLocalListener _listener))
+                return;
+            if (!client._cfgs.ContainsKey(tunnelId))
+                return;
+
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Connect()
+            {
+                TunnelID = tunnelId,
+                Idx = _Idx,
+                Connected = 1
+            });
+
+            //告知给服务端，来自客户端本地的连接建立
+            ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CReverseConnect, (int)ErrorCode.ErrorOk, respData);
+        }
+        /// <summary>
+        /// 当客户端本地端口连接断开
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        public void OnLocalDisconnect(long UID, byte tunnelId, byte _Idx)
+        {
+            ServerManager.g_Log.Debug($"Reverse->OnLocalDisconnect {UID},{tunnelId},{_Idx}");
+            if (!ServerManager.g_ClientMgr.GetClientByUID(UID, out ClientInfo client))
+                return;
+            if (!GetLocalListener(UID, tunnelId, out ForwardLocalListener _listener))
+                return;
+            if (!client._cfgs.ContainsKey(tunnelId))
+                return;
+
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_Disconnect()
+            {
+                TunnelID = tunnelId,
+                Idx = _Idx,
+            });
+
+            //告知给服务端，来自客户端本地的连接断开
+            ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CReverseDisconnect, (int)ErrorCode.ErrorOk, respData);
+        }
+
+        /// <summary>
+        /// 当服务端本地端口连接
+        /// </summary>
+        /// <param name="tunnelId"></param>
+        public void OnRemoteLocalConnect(long UID, byte tunnelId, byte Idx)
+        {
+            ServerManager.g_Log.Debug($"Reverse->OnRemoteLocalConnect {UID},{tunnelId},{Idx}");
+
+            if (!ServerManager.g_ClientMgr.GetClientByUID(UID, out ClientInfo client))
+                return;
+
+            if (!GetLocalListener(UID,tunnelId, out ForwardLocalListener _listener))
+                return;
+
+            //维护状态
+            _listener.SetRemoteConnectd(Idx, true);
+            if (_listener.GetDictMsgQueue(Idx, out List<IdxWithMsg> msglist))
+            {
+                for (int i = 0; i < msglist.Count; i++)
+                {
+                    IdxWithMsg msg = msglist[i];
+                    //投递给服务端，来自客户端本地的连接数据
+                    ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CReverseData, (int)ErrorCode.ErrorOk, msg.data);
+                    //发送后回收
+                    MsgQueuePool._MsgPool.Enqueue(msg);
+                }
+            }
+        }
+
+        /// <summary>
+        /// 当服务端本地端口连接断开
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        public void OnRemoteLocalDisconnect(long UID, byte tunnelId, byte Idx)
+        {
+            ServerManager.g_Log.Debug($"Reverse->OnRemoteLocalDisconnect {UID},{tunnelId},{Idx}");
+
+            if (!ServerManager.g_ClientMgr.GetClientByUID(UID, out ClientInfo client))
+                return;
+
+            if (!GetLocalListener(UID, tunnelId, out ForwardLocalListener _listener))
+                return;
+
+            _listener.SetRemoteConnectd(Idx, false);
+            _listener.CloseConnectByIdx(Idx);
+        }
+        #endregion
+
+        #region 数据投递
+        /// <summary>
+        /// 来自服务端本地连接投递的Tunnel数据
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        /// <param name="data"></param>
+        public void OnRemoteLocalDataCallBack(long UID, byte tunnelId, byte Idx, byte[] data)
+        {
+            //ServerManager.g_Log.Debug($"Reverse->OnRemoteLocalDataCallBack {UID},{tunnelId},{Idx},Data长度：{data.Length}");
+
+            if (!ServerManager.g_ClientMgr.GetClientByUID(UID, out ClientInfo client))
+                return;
+
+            if (!GetLocalListener(UID, tunnelId, out ForwardLocalListener _listener))
+                return;
+
+            //记录压缩前数据长度
+            tReciveAllLenght += data.Length;
+            //解压
+            data = CompressAdapterSelector.Adapter(client.e_CompressAdapter).Decompress(data);
+            _listener.SendSocketByIdx(Idx, data);
+        }
+        /// <summary>
+        /// 来自客户端本地连接投递的Tunnel数据
+        /// </summary>
+        /// <param name="uid"></param>
+        /// <param name="tunnelId"></param>
+        /// <param name="data"></param>
+        public void OnTunnelDataCallBack(long UID, byte tunnelId, byte Idx, byte[] data)
+        {
+            //ServerManager.g_Log.Debug($"Reverse->OnTunnelDataCallBack {UID},{tunnelId},{Idx},Data长度：{data.Length}");
+
+            int SlienLenght = 1000;
+            //判断数据量大时分包
+            if (data.Length > SlienLenght)
+            {
+                Span<byte> tempSpan = data;
+                Span<byte> tempSpanSlien = null;
+                int PageCount = (int)(data.Length / SlienLenght);
+                if (data.Length % SlienLenght > 0)
+                {
+                    PageCount++;
+                }
+
+                for (int i = 0; i < PageCount; i++)
+                {
+                    int StartIdx = i * SlienLenght;
+                    if (i != PageCount - 1)//不是最后一个包
+                        tempSpanSlien = tempSpan.Slice(StartIdx, SlienLenght);
+                    else//最后一个
+                        tempSpanSlien = tempSpan.Slice(StartIdx);
+
+                    SendDataToRemote(UID,tunnelId, Idx, tempSpanSlien.ToArray());
+                }
+                return;
+            }
+            SendDataToRemote(UID, tunnelId, Idx, data);
+        }
+
+        void SendDataToRemote(long UID, byte tunnelId, byte Idx, byte[] data)
+        {
+            //ServerManager.g_Log.Debug($"Reverse->SendDataToRemote {UID},{tunnelId},{Idx},Data长度：{data.Length}");
+
+            if (!ServerManager.g_ClientMgr.GetClientByUID(UID, out ClientInfo client))
+                return;
+
+            if (!GetLocalListener(UID, tunnelId, out ForwardLocalListener _listener))
+                return;
+
+            //压缩
+            data = CompressAdapterSelector.Adapter(client.e_CompressAdapter).Compress(data);
+            //记录压缩后数据长度
+            tSendAllLenght += data.Length;
+
+            byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_Tunnel_DATA()
+            {
+                TunnelID = tunnelId,
+                Idx = Idx,
+                HunterNetCoreData = ByteString.CopyFrom(data)
+            });
+
+            //远程未连接，添加到缓存
+            if (!_listener.CheckRemoteConnect(Idx))
+            {
+                _listener.EnqueueIdxWithMsg(Idx, respData);
+                return;
+            }
+            //投递给服务端，来自客户端本地的连接数据
+            ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CReverseData, (int)ErrorCode.ErrorOk, respData);
+        }
+        #endregion
+    }
+}

NoSugarNet.ServerCore/Manager/ServerManager.cs

@@ -13,15 +13,17 @@ namespace ServerCore.Manager
         public static LogManager g_Log;
         public static LoginManager g_Login;
         public static ChatManager g_Chat;
-        public static LocalClientManager g_Local;
+        public static ForwardLocalClientManager g_ForwardLocal;
+        public static ReverseLocalClientManager g_ReverseLocal;
         public static IOCPNetWork g_SocketMgr;
         public static System.Timers.Timer _SpeedCheckTimeTimer;//速度检测计时器
         public static int TimerInterval = 1000;//计时器间隔
         static long mLastReciveAllLenght = 0;
         static long mSendAllLenght = 0;
-        static NetStatus netStatus;
+        static NetStatus Forward_NetStatus;
+        static NetStatus Reverse_NetStatus;
         #region 委托和事件
-        public delegate void OnUpdateStatusHandler(NetStatus Status);
+        public delegate void OnUpdateStatusHandler(NetStatus ForwardStatus, NetStatus ReverseStatus);
         public static event OnUpdateStatusHandler OnUpdateStatus;
         #endregion
 
@@ -34,11 +36,13 @@ namespace ServerCore.Manager
             g_Log = new LogManager();
             g_Login = new LoginManager();
             g_Chat = new ChatManager();
-            g_Local = new LocalClientManager((E_CompressAdapter)compressAdapterType);
+            g_ForwardLocal = new ForwardLocalClientManager((E_CompressAdapter)compressAdapterType);
+            g_ReverseLocal = new ReverseLocalClientManager();
             //g_SocketMgr = new IOCPNetWork(1024, 1024);
             g_SocketMgr = new IOCPNetWork(1024, 4096);
 
-            netStatus = new NetStatus();
+            Forward_NetStatus = new NetStatus();
+            Reverse_NetStatus = new NetStatus();
 
             g_SocketMgr.Init();
             g_SocketMgr.Start(new IPEndPoint(IPAddress.Any.Address, port));
@@ -53,23 +57,47 @@ namespace ServerCore.Manager
 
         static void Checktimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
         {
-            g_Local.GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght);
-            g_Local.GetClientCount(out int ClientUserCount, out int TunnelCount);
-            NetStatus resutnetStatus = new NetStatus()
             {
-                TunnelCount = TunnelCount,
+
-                ClientUserCount = ClientUserCount,
+                g_ForwardLocal.GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght);
-                srcSendAllLenght = resultSendAllLenght,
+                g_ForwardLocal.GetClientCount(out int ClientUserCount, out int TunnelCount);
-                srcReciveAllLenght = resultReciveAllLenght,
+                NetStatus resutnetStatus = new NetStatus()
-                srcReciveSecSpeed = (resultReciveAllLenght - netStatus.srcReciveAllLenght) / (TimerInterval / 1000),
+                {
-                srcSendSecSpeed = (resultSendAllLenght - netStatus.srcSendAllLenght) / (TimerInterval / 1000),
+                    TunnelCount = TunnelCount,
-                tSendAllLenght = g_Local.tSendAllLenght,
+                    ClientUserCount = ClientUserCount,
-                tReciveAllLenght = g_Local.tReciveAllLenght,
+                    srcSendAllLenght = resultSendAllLenght,
-                tSendSecSpeed = (g_Local.tSendAllLenght - netStatus.tSendAllLenght) / (TimerInterval / 1000),
+                    srcReciveAllLenght = resultReciveAllLenght,
-                tReciveSecSpeed = (g_Local.tReciveAllLenght - netStatus.tReciveAllLenght) / (TimerInterval / 1000),
+                    srcReciveSecSpeed = (resultReciveAllLenght - Forward_NetStatus.srcReciveAllLenght) / (TimerInterval / 1000),
-            };
+                    srcSendSecSpeed = (resultSendAllLenght - Forward_NetStatus.srcSendAllLenght) / (TimerInterval / 1000),
-            netStatus = resutnetStatus;
+                    tSendAllLenght = g_ForwardLocal.tSendAllLenght,
-            OnUpdateStatus?.Invoke(resutnetStatus);
+                    tReciveAllLenght = g_ForwardLocal.tReciveAllLenght,
+                    tSendSecSpeed = (g_ForwardLocal.tSendAllLenght - Forward_NetStatus.tSendAllLenght) / (TimerInterval / 1000),
+                    tReciveSecSpeed = (g_ForwardLocal.tReciveAllLenght - Forward_NetStatus.tReciveAllLenght) / (TimerInterval / 1000),
+                };
+                Forward_NetStatus = resutnetStatus;
+            }
+
+            {
+
+                g_ReverseLocal.GetCurrLenght(out long resultReciveAllLenght, out long resultSendAllLenght);
+                g_ReverseLocal.GetClientCount(out int ClientUserCount, out int TunnelCount);
+                NetStatus resutnetStatus = new NetStatus()
+                {
+                    TunnelCount = TunnelCount,
+                    ClientUserCount = ClientUserCount,
+                    srcSendAllLenght = resultSendAllLenght,
+                    srcReciveAllLenght = resultReciveAllLenght,
+                    srcReciveSecSpeed = (resultReciveAllLenght - Reverse_NetStatus.srcReciveAllLenght) / (TimerInterval / 1000),
+                    srcSendSecSpeed = (resultSendAllLenght - Reverse_NetStatus.srcSendAllLenght) / (TimerInterval / 1000),
+                    tSendAllLenght = g_ReverseLocal.tSendAllLenght,
+                    tReciveAllLenght = g_ReverseLocal.tReciveAllLenght,
+                    tSendSecSpeed = (g_ReverseLocal.tSendAllLenght - Reverse_NetStatus.tSendAllLenght) / (TimerInterval / 1000),
+                    tReciveSecSpeed = (g_ReverseLocal.tReciveAllLenght - Reverse_NetStatus.tReciveAllLenght) / (TimerInterval / 1000),
+                };
+                Reverse_NetStatus = resutnetStatus;
+            }
+
+            OnUpdateStatus?.Invoke(Forward_NetStatus, Reverse_NetStatus);
         }
 
     }

NoSugarNet.sln

@@ -22,7 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoSugarNet.ServerCli", "Sam
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetLib_Standard2", "NetLib_Standard2", "{4A660CAE-CD92-411C-9D8E-7CB677DB3C74}"
 	ProjectSection(SolutionItems) = preProject
-		Lib\NetLib_Standard2\HaoYueNet.ClientNetworkNet.Standard2.dll = Lib\NetLib_Standard2\HaoYueNet.ClientNetworkNet.Standard2.dll
+		Lib\NetLib_Standard2\HaoYueNet.ClientNetwork.Standard2.dll = Lib\NetLib_Standard2\HaoYueNet.ClientNetwork.Standard2.dll
 		Lib\NetLib_Standard2\HaoYueNet.ServerNetwork.Standard2.dll = Lib\NetLib_Standard2\HaoYueNet.ServerNetwork.Standard2.dll
 		Lib\NetLib_Standard2\NoSugarNet.DataHelper.deps.json = Lib\NetLib_Standard2\NoSugarNet.DataHelper.deps.json
 		Lib\NetLib_Standard2\NoSugarNet.DataHelper.dll = Lib\NetLib_Standard2\NoSugarNet.DataHelper.dll
@@ -31,7 +31,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetLib_Standard2", "NetLib_
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoSugarNet.ClientCore.Standard2", "NoSugarNet.ClientCore.Standard2\NoSugarNet.ClientCore.Standard2.csproj", "{5DB2B608-6F99-430A-99AC-534410393955}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoSugarNet.Adapter", "NoSugarNet.Adapter\NoSugarNet.Adapter.csproj", "{961FA85B-B6A7-4F45-8239-9E91315253B4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoSugarNet.Adapter", "NoSugarNet.Adapter\NoSugarNet.Adapter.csproj", "{961FA85B-B6A7-4F45-8239-9E91315253B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoSugarNet.ClientCli.Standard2", "NoSugarNet.ClientCli.Standard2\NoSugarNet.ClientCli.Standard2.csproj", "{97906C2A-2C93-4C63-A237-A75B6EDA8FA4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -63,6 +65,10 @@ Global
 		{961FA85B-B6A7-4F45-8239-9E91315253B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{961FA85B-B6A7-4F45-8239-9E91315253B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{961FA85B-B6A7-4F45-8239-9E91315253B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{97906C2A-2C93-4C63-A237-A75B6EDA8FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97906C2A-2C93-4C63-A237-A75B6EDA8FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{97906C2A-2C93-4C63-A237-A75B6EDA8FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97906C2A-2C93-4C63-A237-A75B6EDA8FA4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -71,6 +77,7 @@ Global
 		{29D76CF3-BF7E-45A5-9957-2CBC0A41B6FB} = {5E65F25A-8B59-4FC7-8582-C6887C3CD0A1}
 		{65220036-9A81-49FA-A5BC-DA06783D2E52} = {5E65F25A-8B59-4FC7-8582-C6887C3CD0A1}
 		{4A660CAE-CD92-411C-9D8E-7CB677DB3C74} = {EDA9D3FD-1A72-434D-81F6-B1B420406D20}
+		{97906C2A-2C93-4C63-A237-A75B6EDA8FA4} = {5E65F25A-8B59-4FC7-8582-C6887C3CD0A1}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {637DC2BB-F9BB-41A2-ADC0-B41B871F66DE}

NosugarNetForUnity/Assets/MainUI.cs

@@ -1,7 +1,6 @@
-using NoSugarNet.ClientCoreNet.Standard2;
+using NoSugarNet.ClientCore;
+using NoSugarNet.ClientCore.Common;
 using System;
-using System.Collections;
-using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -28,8 +27,7 @@ public class MainUI : MonoBehaviour
         btnStop.onClick.AddListener(StopNoSugarNetClient);
         AddLog("");
 
-        AppNoSugarNet.OnUpdateStatus += OnUpdateStatus;
+        AppNoSugarNet.Init(new System.Collections.Generic.Dictionary<byte, TunnelClientData>(),0, OnNoSugarNetLog);
-        AppNoSugarNet.Init(OnNoSugarNetLog);
     }
 
     private void OnDisable()

NosugarNetForUnity/Assets/Plugins/HaoYueNet.ClientNetwork.Standard2.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 324deac494a24a7499801349c7908062
+guid: 190142f96344cb447afd8a87378fa1df
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2

NosugarNetForUnity/Assets/Plugins/NoSugarNet.DataHelper.dll.meta

@@ -1,33 +0,0 @@
-fileFormatVersion: 2
-guid: 1d83e3c67ee8b794c97b5876ece7a16e
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  - first:
-      Windows Store Apps: WindowsStoreApps
-    second:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

ProtobufCore/proto/protobuf_NoSugar.proto

@@ -9,16 +9,24 @@ enum CommandID
 	
 	CMD_LOGIN = 2001;  //自动登录上行 | 下行 对应 Protobuf_Login | Protobuf_Login_RESP
 	
-	CMD_CFGS = 3001; //配置信息 下行 对应 Protobuf_Cfgs
+	CMD_SERVER_CFGS = 3001; //配置信息 下行 对应 Protobuf_Cfgs
+	CMD_CLIENT_CFGS = 3002; //配置信息 上行 对应 Protobuf_Cfgs
 	
 	CMD_CHATMSG = 4001;  //广播信息上行 | 下行 对应 Protobuf_ChatMsg | Protobuf_ChatMsg_RESP
 	
-	CMD_TUNNEL_C2S_CONNECT = 5000;  //客户端告知服务端 客户端本地连接建立 上行 Protobuf_C2S_Connect
+	CMD_TUNNEL_C2S_FORWARD_CONNECT = 5000;  //正向代理，客户端告知服务端 客户端本地连接建立 上行 Protobuf_Tunnel_Connect
-	CMD_TUNNEL_S2C_CONNECT = 5001;  //服务端告知客户端 服务端本地连接建立 下行 Protobuf_S2C_Connect
+	CMD_TUNNEL_S2C_FORWARD_CONNECT = 5001;  //正向代理，服务端告知客户端 服务端本地连接建立 下行 Protobuf_Tunnel_Connect
-	CMD_TUNNEL_C2S_DISCONNECT = 5002;  //客户端告知服务端 客户端本地连接断开 上行 Protobuf_C2S_Disconnect
+	CMD_TUNNEL_C2S_FORWARD_DISCONNECT = 5002;  //正向代理，客户端告知服务端 客户端本地连接断开 上行 Protobuf_Tunnel_Disconnect
-	CMD_TUNNEL_S2C_DISCONNECT = 5003;  //服务端告知客户端 服务端本地连接断开 下行 Protobuf_S2C_Disconnect
+	CMD_TUNNEL_S2C_FORWARD_DISCONNECT = 5003;  //正向代理，服务端告知客户端 服务端本地连接断开 下行 Protobuf_Tunnel_Disconnect
-	CMD_TUNNEL_C2S_DATA = 5004;  //客户端投递本地TCP通讯数据包 上行 Protobuf_C2S_DATA
+	CMD_TUNNEL_C2S_FORWARD_DATA = 5004;  //正向代理，客户端投递本地TCP通讯数据包 上行 Protobuf_Tunnel_DATA
-	CMD_TUNNEL_S2C_DATA = 5005;  //服务端投递本地TCP通讯数据包 下行 Protobuf_S2C_DATA
+	CMD_TUNNEL_S2C_FORWARD_DATA = 5005;  //正向代理，服务端投递本地TCP通讯数据包 下行 Protobuf_Tunnel_DATA
+	
+	CMD_TUNNEL_C2S_REVERSE_CONNECT = 6000;  //反向代理，客户端告知服务端 客户端本地连接建立 上行 Protobuf_Tunnel_Connect
+	CMD_TUNNEL_S2C_REVERSE_CONNECT = 6001;  //反向代理，服务端告知客户端 服务端本地连接建立 下行 Protobuf_Tunnel_Connect
+	CMD_TUNNEL_C2S_REVERSE_DISCONNECT = 6002;  //反向代理，客户端告知服务端 客户端本地连接断开 上行 Protobuf_Tunnel_Disconnect
+	CMD_TUNNEL_S2C_REVERSE_DISCONNECT = 6003;  //反向代理，服务端告知客户端 服务端本地连接断开 下行 Protobuf_Tunnel_Disconnect
+	CMD_TUNNEL_C2S_REVERSE_DATA = 6004;  //反向代理，客户端投递本地TCP通讯数据包 上行 Protobuf_Tunnel_DATA
+	CMD_TUNNEL_S2C_REVERSE_DATA = 6005;  //反向代理，服务端投递本地TCP通讯数据包 下行 Protobuf_Tunnel_DATA
 }
 
 enum ErrorCode
@@ -67,6 +75,7 @@ message Protobuf_Login_RESP
 	string LastLoginDate = 2;//上次登录时间（只用于呈现的字符串，若界面需求需要）
 	string RegDate = 3;//注册时间（只用于呈现的字符串，若界面需求需要）
 	LoginResultStatus Status = 4;//账号状态 （预留） [1]正常[0]被禁封
+	int64 UID = 5;
 }
 
 //配置下行
@@ -97,39 +106,20 @@ message Protobuf_ChatMsg_RESP
 }
 
 
-message Protobuf_C2S_Connect
+message Protobuf_Tunnel_Connect
-{
-	uint32 TunnelID = 1;//TunnelID
-	uint32 Idx = 2;//单个隧道连接下标
-}
-
-message Protobuf_S2C_Connect
 {
 	uint32 TunnelID = 1;//TunnelID
 	uint32 Idx = 2;//单个隧道连接下标
 	uint32 Connected = 3;//[0]连接失败 [1]连接成功
 }
 
-message Protobuf_C2S_Disconnect
+message Protobuf_Tunnel_Disconnect
 {
 	uint32 TunnelID = 1;//TunnelID
 	uint32 Idx = 2;//单个隧道连接下标
 }
 
-message Protobuf_S2C_Disconnect
+message Protobuf_Tunnel_DATA
-{
-	uint32 TunnelID = 1;//TunnelID
-	uint32 Idx = 2;//单个隧道连接下标
-}
-
-message Protobuf_C2S_DATA
-{
-	uint32 TunnelID = 1;//TunnelID
-	uint32 Idx = 2;//单个隧道连接下标
-    bytes HunterNetCore_Data = 3;
-}
-
-message Protobuf_S2C_DATA
 {
 	uint32 TunnelID = 1;//TunnelID
 	uint32 Idx = 2;//单个隧道连接下标

README.md

@@ -1,6 +1,8 @@
 ## NoSugarNet
 
-NoSugarNet（无糖网络），一个有效降低任意C/S程序（软件，程序）网络流量传输的网络中间工具。
+NoSugarNet（无糖网络），一个有效降低任意C/S程序（游戏，程序）网络流量传输的网络中间工具。
+
+同时，也可以作为通用性极强、高性能、反向代理内网穿透工具。
 
 ### 有意义的应用场景
 
@@ -20,7 +22,13 @@ NoSugarNet（无糖网络），一个有效降低任意C/S程序（软件，程
 	
 	使用NoSugarNet,您就可以突破这个限制。
 	
-3. 您的程序集成需求
+3. 反向代理
+
+	在某一方面，优于frp等反向代理工具。
+	
+	frp等反代工具，是端口一对一的。而NoSugarNet是，多对一对一对多。
+
+4. 您的程序集成需求
 
 	您可以在你的网关程序，客户端登陆器，代理程序或传输业务层接入NoSugarNet。
 	
@@ -43,20 +51,14 @@ NoSugarNet（无糖网络），一个有效降低任意C/S程序（软件，程
 
 其中config.cfg 是配置文件
 
-格式：
+服务器代理，可以配置正向代理的配置。
-
-```
-  <配置编号>:<目标服务端IP>:<目标服务器端口>:<客户端监听的端口>
-```
-
-每个配置换行
 
 形如
 
 ```
 {
   "ServerPort": 1000,
-  "CompressAdapterType": 1,
+  "CompressAdapterType": 0,
   "TunnelList": [
     {
       "ServerLocalTargetIP": "1.2.3.4",
@@ -74,24 +76,55 @@ NoSugarNet（无糖网络），一个有效降低任意C/S程序（软件，程
 
 表示
 
-本代理服务，可以连接代理访问，1.2.3.4:3389 和 1.2.3.5:3306 
+服务器正向代理服务，可以连接代理访问，1.2.3.4:3389 和 1.2.3.5:3306 
 
-配置编号和客户端安排端口会发送到给客户端。
+TunnelList 是告知客户端[正向代理]的配置，
 
-客户端连接服务器获取基本信息后，客户端会开始监听10001和10002
+配置编号会发送给客户端。
+
+客户端连接服务器获取基本信息后，客户端会开始监听10001和10002，开启正向代理服务。
+
+效果为: 
+
+任何用户 访问客户端侧的 localhost:13389 最终会转发到 服务器侧的1.2.3.4:3389
+
+任何用户 访问客户端侧的 localhost:13306 最终会转发到 服务器侧的1.2.3.4:3306
 
 ————————————————————
 
 ## 客户端 NoSugarNet.ClientCli
 
-其中config.cfg 是配置文件
+其中config.cfg 是配置文件 配置服务器IP和端口，以及可选的请求反向代理的本地端口和的远端端口
 
 格式：
 
 ```
-<代理服务端IP>:<代理服务端Port>
+{
+  "ServerIP": "6.6.6.6",
+  "ServerPort": 1000,
+  "CompressAdapterType": 0,
+  "TunnelList": [
+    {
+      "LocalTargetIP": "127.0.0.1",
+      "LocalTargetPort": 3389,
+      "RemoteLocalPort": 20001
+    }
+  ]
+}
 ```
 
-*代理端口IP可以改，端口哦固定为1000，因为服务器中转端口写死的1000（笑）
+表示：
 
+客户端连接服务器IP 为6.6.6.6 端口1000
 
+TunnelList 是客户端请求服务器[反向代理]的配置
+
+配置发送给服务端。
+
+客户端连接服务器上报配置后，服务端会开始监听20001端口，开启反向代理服务。
+
+如上示例为 请求服务器监听20001端口，做反向代理到本地127.0.0.1:3389
+
+效果为: 
+
+任何用户 访问服务器侧的 服务器IP:20001 最终会转发到 客户端测侧的127.0.0.1:3389

Sample/NoSugarNet.ClientCli/Config.cs

@@ -1,33 +1,64 @@
 using System.Text;
+using System.Text.Encodings.Web;
+using System.Text.Json;
+using System.Text.Unicode;
 
 namespace NoSugarNet.ClientCli
 {
+
+    public class ConfigDataModel
+    {
+        public string ServerIP { get; set; }
+        public int ServerPort { get; set; }
+        public int CompressAdapterType { get; set; }
+        public List<ConfigDataModel_Single> TunnelList { get; set; }
+    }
+
+    public class ConfigDataModel_Single
+    {
+        public string LocalTargetIP { get; set; }
+        public int LocalTargetPort { get; set; }
+        public int RemoteLocalPort { get; set; }
+    }
+
     public static class Config
     {
-        public static string ServerIP;
+        public static ConfigDataModel cfg;
-        public static int ServerPort;
         public static bool LoadConfig()
         {
             try
             {
-                StreamReader sr = new StreamReader(System.Environment.CurrentDirectory + "//config.cfg", Encoding.Default);
+                string path = System.Environment.CurrentDirectory + "//config.cfg";
-                String line;
+                if (!File.Exists(path))
-                while (!string.IsNullOrEmpty((line = sr.ReadLine())))
                 {
-                    if (!line.Contains(":"))
+                    ConfigDataModel sampleCfg = new ConfigDataModel
-                        continue;
-                    try
                     {
-                        ServerIP = line.Split(':')[0].Trim();
+                        ServerIP = "127.0.0.1",
-                        ServerPort = Convert.ToInt32(line.Split(':')[1].Trim());
+                        ServerPort = 1000,
-                    }
+                        TunnelList = new List<ConfigDataModel_Single>()
-                    catch
+                        {
+                            new ConfigDataModel_Single(){ LocalTargetIP = "127.0.0.1",LocalTargetPort=3389,RemoteLocalPort = 20001},
+                            new ConfigDataModel_Single(){ LocalTargetIP = "127.0.0.1",LocalTargetPort=3389,RemoteLocalPort = 20002}
+                        }
+                    };
+
+                    string jsonString = JsonSerializer.Serialize(sampleCfg, new JsonSerializerOptions()
                     {
-                        continue;
+                        // 整齐打印
-                    }
+                        WriteIndented = true,
+                        //重新编码，解决中文乱码问题
+                        Encoder = JavaScriptEncoder.Create(UnicodeRanges.All)
+                    });
+                    System.IO.File.WriteAllText(path, jsonString, Encoding.UTF8);
+
+                    Console.WriteLine("未找到配置，已生成模板，请浏览" + path);
+                    return false;
                 }
+                StreamReader sr = new StreamReader(path, Encoding.Default);
+                String jsonstr = sr.ReadToEnd();
+                cfg = JsonSerializer.Deserialize<ConfigDataModel>(jsonstr);
                 sr.Close();
-                if (!string.IsNullOrEmpty(ServerIP))
+                if (cfg?.TunnelList.Count > 0)
                     return true;
                 else
                     return false;

Sample/NoSugarNet.ClientCli/Program.cs

@@ -1,4 +1,5 @@
 using NoSugarNet.ClientCore;
+using NoSugarNet.ClientCore.Common;
 
 namespace NoSugarNet.ClientCli
 {
@@ -14,8 +15,22 @@ namespace NoSugarNet.ClientCli
                 return;
             }
             AppNoSugarNet.OnUpdateStatus += OnUpdateStatus;
-            AppNoSugarNet.Init(OnNoSugarNetLog);
+
-            AppNoSugarNet.Connect(Config.ServerIP, Config.ServerPort);
+            Dictionary<byte, TunnelClientData> dictTunnel = new Dictionary<byte, TunnelClientData>();
+            for (int i = 0; i < Config.cfg.TunnelList.Count; i++)
+            {
+                ConfigDataModel_Single cfgSingle = Config.cfg.TunnelList[i];
+                dictTunnel[(byte)i] = new TunnelClientData()
+                {
+                    TunnelId = (byte)i,
+                    LocalTargetIP = cfgSingle.LocalTargetIP,
+                    LocalTargetPort = (ushort)cfgSingle.LocalTargetPort,
+                    RemoteLocalPort = (ushort)cfgSingle.RemoteLocalPort,
+                };
+            }
+
+            AppNoSugarNet.Init(dictTunnel, Config.cfg.CompressAdapterType, OnNoSugarNetLog);
+            AppNoSugarNet.Connect(Config.cfg.ServerIP, Config.cfg.ServerPort);
             while (true)
             {
                 string CommandStr = Console.ReadLine();
@@ -25,13 +40,13 @@ namespace NoSugarNet.ClientCli
                 switch (Command)
                 {
                     case "con":
-                        AppNoSugarNet.Connect(Config.ServerIP, Config.ServerPort);
+                        AppNoSugarNet.Connect(Config.cfg.ServerIP, Config.cfg.ServerPort);
                         break;
                     case "tlist":
-                        AppNoSugarNet.local.GetClientCount(out int ClientUserCount, out int TunnelCount);
+                        AppNoSugarNet.forwardlocal.GetClientCount(out int ClientUserCount, out int TunnelCount);
                         Console.WriteLine($"GetClientCount->{ClientUserCount} TunnelCount->{TunnelCount}");
 
-                        AppNoSugarNet.local.GetClientDebugInfo();
+                        AppNoSugarNet.forwardlocal.GetClientDebugInfo();
                         break;
                     case "stop":
                         AppNoSugarNet.Close();
@@ -41,10 +56,10 @@ namespace NoSugarNet.ClientCli
                 }
             }
         }
-        static void OnUpdateStatus(NetStatus netState)
+        static void OnUpdateStatus(NetStatus Forward_NetStatus, NetStatus Reverse_NetStatus)
         {
-            //string info = $"User:{netState.ClientUserCount}   Tun:{netState.TunnelCount}    rec:{netState.srcReciveAllLenght}|{netState.tReciveAllLenght}   {ConvertBytesToKilobytes(netState.srcReciveSecSpeed)}K/s|{ConvertBytesToKilobytes(netState.tReciveSecSpeed)}K/s   send:{netState.srcSendAllLenght}|{netState.tSendAllLenght} {ConvertBytesToKilobytes(netState.srcSendSecSpeed)}K/s|{ConvertBytesToKilobytes(netState.tSendSecSpeed)}K/s";
+            string info = $"Forward: t:{Forward_NetStatus.TunnelCount} r:{ConvertBytesToKilobytes(Forward_NetStatus.srcReciveSecSpeed)}K/s|{ConvertBytesToKilobytes(Forward_NetStatus.tReciveSecSpeed)}K/s s: {ConvertBytesToKilobytes(Forward_NetStatus.srcSendSecSpeed)}K/s|{ConvertBytesToKilobytes(Forward_NetStatus.tSendSecSpeed)}K/s" +
-            string info = $"User:{netState.ClientUserCount} Tun:{netState.TunnelCount}      rec: {ConvertBytesToKilobytes(netState.srcReciveSecSpeed)}K/s|{ConvertBytesToKilobytes(netState.tReciveSecSpeed)}K/s        send: {ConvertBytesToKilobytes(netState.srcSendSecSpeed)}K/s|{ConvertBytesToKilobytes(netState.tSendSecSpeed)}K/s";
+                $"| Reverse t:{Reverse_NetStatus.TunnelCount} r:{ConvertBytesToKilobytes(Reverse_NetStatus.srcReciveSecSpeed)}K/s|{ConvertBytesToKilobytes(Reverse_NetStatus.tReciveSecSpeed)}K/s s: {ConvertBytesToKilobytes(Reverse_NetStatus.srcSendSecSpeed)}K/s|{ConvertBytesToKilobytes(Reverse_NetStatus.tSendSecSpeed)}K/s";
             Console.Title = Title + info;
             Console.WriteLine(info);
         }

Sample/NoSugarNet.ClientCli/Properties/PublishProfiles/FolderProfile.pubxml

@@ -6,13 +6,12 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\net8.0\publish\win-x64\</PublishDir>
+    <PublishDir>bin\Release\net8.0\publish\linux-x64\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
     <TargetFramework>net8.0</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>
-    <PublishReadyToRun>false</PublishReadyToRun>
   </PropertyGroup>
 </Project>

Sample/NoSugarNet.ClientCli/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2024-06-18T04:59:35.6257454Z;True|2024-06-18T10:27:07.8233386+08:00;True|2024-06-17T15:05:24.3158316+08:00;True|2024-05-20T18:14:09.8394409+08:00;True|2024-05-20T18:13:33.8442145+08:00;True|2024-05-20T18:01:49.3220793+08:00;True|2024-05-20T18:01:28.3681468+08:00;True|2024-04-14T22:24:49.2846754+08:00;True|2024-01-23T16:35:06.3918472+08:00;True|2024-01-23T16:34:52.0595483+08:00;True|2024-01-23T16:27:36.4850749+08:00;True|2024-01-23T16:27:04.0721589+08:00;</History>
+    <History>True|2024-06-26T08:20:13.8778793Z;True|2024-06-26T15:41:32.1172715+08:00;True|2024-06-18T12:59:35.6257454+08:00;True|2024-06-18T10:27:07.8233386+08:00;True|2024-06-17T15:05:24.3158316+08:00;True|2024-05-20T18:14:09.8394409+08:00;True|2024-05-20T18:13:33.8442145+08:00;True|2024-05-20T18:01:49.3220793+08:00;True|2024-05-20T18:01:28.3681468+08:00;True|2024-04-14T22:24:49.2846754+08:00;True|2024-01-23T16:35:06.3918472+08:00;True|2024-01-23T16:34:52.0595483+08:00;True|2024-01-23T16:27:36.4850749+08:00;True|2024-01-23T16:27:04.0721589+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

Sample/NoSugarNet.ServerCli/NoSugarNet.ServerCli.csproj

@@ -16,6 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\NoSugarNet.ClientCore.Standard2\NoSugarNet.ClientCore.Standard2.csproj" />
     <ProjectReference Include="..\..\NoSugarNet.ServerCore\NoSugarNet.ServerCore.csproj" />
   </ItemGroup>
 

Sample/NoSugarNet.ServerCli/Program.cs

@@ -38,10 +38,10 @@ namespace NoSugarNet.ServerCli
             }
         }
 
-        static void OnUpdateStatus(NetStatus netState)
+        static void OnUpdateStatus(NetStatus Forward_NetStatus, NetStatus Reverse_NetStatus)
         {
-            //string info = $"User:{netState.ClientUserCount}   Tun:{netState.TunnelCount}    rec:{netState.srcReciveAllLenght}|{netState.tReciveAllLenght}   {ConvertBytesToKilobytes(netState.srcReciveSecSpeed)}K/s|{ConvertBytesToKilobytes(netState.tReciveSecSpeed)}K/s   send:{netState.srcSendAllLenght}|{netState.tSendAllLenght} {ConvertBytesToKilobytes(netState.srcSendSecSpeed)}K/s|{ConvertBytesToKilobytes(netState.tSendSecSpeed)}K/s";
+            string info = $"Forward: user:{Forward_NetStatus.ClientUserCount} t:{Forward_NetStatus.TunnelCount} r:{ConvertBytesToKilobytes(Forward_NetStatus.srcReciveSecSpeed)}K/s|{ConvertBytesToKilobytes(Forward_NetStatus.tReciveSecSpeed)}K/s s: {ConvertBytesToKilobytes(Forward_NetStatus.srcSendSecSpeed)}K/s|{ConvertBytesToKilobytes(Forward_NetStatus.tSendSecSpeed)}K/s" +
-            string info = $"User:{netState.ClientUserCount} Tun:{netState.TunnelCount}      rec: {ConvertBytesToKilobytes(netState.srcReciveSecSpeed)}K/s|{ConvertBytesToKilobytes(netState.tReciveSecSpeed)}K/s        send: {ConvertBytesToKilobytes(netState.srcSendSecSpeed)}K/s|{ConvertBytesToKilobytes(netState.tSendSecSpeed)}K/s";
+                $"| Reverse user:{Reverse_NetStatus.ClientUserCount} t:{Reverse_NetStatus.TunnelCount} r:{ConvertBytesToKilobytes(Reverse_NetStatus.srcReciveSecSpeed)}K/s|{ConvertBytesToKilobytes(Reverse_NetStatus.tReciveSecSpeed)}K/s s: {ConvertBytesToKilobytes(Reverse_NetStatus.srcSendSecSpeed)}K/s|{ConvertBytesToKilobytes(Reverse_NetStatus.tSendSecSpeed)}K/s";
             Console.Title = Title + info;
             Console.WriteLine(info);
         }

Sample/NoSugarNet.ServerCli/Properties/PublishProfiles/FolderProfile.pubxml

@@ -13,6 +13,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <PublishSingleFile>false</PublishSingleFile>
-    <PublishReadyToRun>true</PublishReadyToRun>
+    <PublishReadyToRun>false</PublishReadyToRun>
   </PropertyGroup>
 </Project>

Sample/NoSugarNet.ServerCli/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2024-06-25T05:14:05.9372915Z;True|2024-06-18T11:37:53.3986849+08:00;True|2024-06-18T11:21:56.8035265+08:00;True|2024-06-18T11:21:19.5434721+08:00;True|2024-06-18T11:21:01.1589956+08:00;True|2024-06-18T11:13:38.3624463+08:00;True|2024-06-18T11:10:28.0508856+08:00;True|2024-06-18T10:39:23.0033920+08:00;True|2024-06-18T10:28:08.9658896+08:00;True|2024-06-17T14:46:33.2307641+08:00;True|2024-05-20T17:56:34.6581491+08:00;True|2024-04-23T17:02:36.4793408+08:00;True|2024-04-15T15:24:50.3598281+08:00;True|2024-04-15T15:24:34.0374231+08:00;True|2024-01-25T17:09:07.9161603+08:00;True|2024-01-23T18:28:01.1220581+08:00;True|2024-01-23T16:36:21.1141328+08:00;</History>
+    <History>True|2024-06-27T06:13:40.7777222Z;True|2024-06-26T15:56:48.7750337+08:00;True|2024-06-26T15:52:00.1532751+08:00;True|2024-06-25T13:14:05.9372915+08:00;True|2024-06-18T11:37:53.3986849+08:00;True|2024-06-18T11:21:56.8035265+08:00;True|2024-06-18T11:21:19.5434721+08:00;True|2024-06-18T11:21:01.1589956+08:00;True|2024-06-18T11:13:38.3624463+08:00;True|2024-06-18T11:10:28.0508856+08:00;True|2024-06-18T10:39:23.0033920+08:00;True|2024-06-18T10:28:08.9658896+08:00;True|2024-06-17T14:46:33.2307641+08:00;True|2024-05-20T17:56:34.6581491+08:00;True|2024-04-23T17:02:36.4793408+08:00;True|2024-04-15T15:24:50.3598281+08:00;True|2024-04-15T15:24:34.0374231+08:00;True|2024-01-25T17:09:07.9161603+08:00;True|2024-01-23T18:28:01.1220581+08:00;True|2024-01-23T16:36:21.1141328+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>