From cd1809587ba8c111a9d3399c9cd466aa4b623a0f Mon Sep 17 00:00:00 2001 From: sin365 <353374337@qq.com> Date: Tue, 25 Jun 2024 18:29:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NoSugarNet.ClientCore/Common/Config.cs | 7 +++---- NoSugarNet.ClientCore/Manager/AppReverseLocalClient.cs | 4 ++-- Sample/NoSugarNet.ClientCli/Program.cs | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/NoSugarNet.ClientCore/Common/Config.cs b/NoSugarNet.ClientCore/Common/Config.cs index 5a13f72..a0aeef3 100644 --- a/NoSugarNet.ClientCore/Common/Config.cs +++ b/NoSugarNet.ClientCore/Common/Config.cs @@ -5,11 +5,10 @@ namespace NoSugarNet.ClientCore.Common public struct TunnelClientData { public byte TunnelId; - public string ServerLocalTargetIP; - public ushort ServerLocalTargetPort; - public ushort ClientLocalPort; + public string LocalTargetIP; + public ushort LocalTargetPort; + public ushort RemoteLocalPort; } - public static class Config { public static Dictionary cfgs = new Dictionary(); diff --git a/NoSugarNet.ClientCore/Manager/AppReverseLocalClient.cs b/NoSugarNet.ClientCore/Manager/AppReverseLocalClient.cs index ae3bd4a..6db5ca3 100644 --- a/NoSugarNet.ClientCore/Manager/AppReverseLocalClient.cs +++ b/NoSugarNet.ClientCore/Manager/AppReverseLocalClient.cs @@ -49,7 +49,7 @@ namespace ServerCore.Manager _Protobuf_Cfgs.Cfgs.Clear(); foreach (var cfg in Config.cfgs) { - _Protobuf_Cfgs.Cfgs.Add(new Protobuf_Cfgs_Single() { Port = cfg.Value.ClientLocalPort, TunnelID = cfg.Value.TunnelId }); + _Protobuf_Cfgs.Cfgs.Add(new Protobuf_Cfgs_Single() { Port = cfg.Value.RemoteLocalPort, TunnelID = cfg.Value.TunnelId }); } AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdClientCfgs, ProtoBufHelper.Serizlize(_Protobuf_Cfgs)); } @@ -101,7 +101,7 @@ namespace ServerCore.Manager BackwardLocalClient serverLocalClient = new BackwardLocalClient(AppNoSugarNet.user.userdata.UID, tunnelId, (byte)Idx); serverLocalClient.BandEvent(AppNoSugarNet.log.Log, OnClientLocalConnect, OnClientLocalDisconnect, OnClientLocalDataCallBack); //连接成功 - if (!serverLocalClient.Init(tunnelDataCfg.ServerLocalTargetIP, tunnelDataCfg.ServerLocalTargetPort)) + if (!serverLocalClient.Init(tunnelDataCfg.LocalTargetIP, tunnelDataCfg.LocalTargetPort)) { //TODO告知客户端连接失败 diff --git a/Sample/NoSugarNet.ClientCli/Program.cs b/Sample/NoSugarNet.ClientCli/Program.cs index 55df209..da49759 100644 --- a/Sample/NoSugarNet.ClientCli/Program.cs +++ b/Sample/NoSugarNet.ClientCli/Program.cs @@ -23,9 +23,9 @@ namespace NoSugarNet.ClientCli dictTunnel[(byte)i] = new TunnelClientData() { TunnelId = (byte)i, - ServerLocalTargetIP = cfgSingle.LocalTargetIP, - ServerLocalTargetPort = (ushort)cfgSingle.LocalTargetPort, - ClientLocalPort = (ushort)cfgSingle.ClientLocalPort, + LocalTargetIP = cfgSingle.LocalTargetIP, + LocalTargetPort = (ushort)cfgSingle.LocalTargetPort, + RemoteLocalPort = (ushort)cfgSingle.RemoteLocalPort, }; }