From a07a964a0f4b3bac9d8400790c9e3b9c10027a5c Mon Sep 17 00:00:00 2001 From: sin365 <353374337@qq.com> Date: Mon, 22 Jan 2024 15:08:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E5=88=9D=E3=81=AE=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E9=80=9A=E8=AE=AF=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Lib/HaoYueNet.ClientNetwork.dll | Bin 19968 -> 19968 bytes Lib/HaoYueNet.ServerNetwork.dll | Bin 25088 -> 24576 bytes NoSugarNet.ClientCore/Event/EventSystem.cs | 10 +- NoSugarNet.ClientCore/Manager/AppChat.cs | 2 +- .../Manager/AppLocalClient.cs | 20 ++- .../Manager/LocalClient/LocalListener.cs | 5 +- NoSugarNet.ClientCore/Network/NetMsg.cs | 2 +- .../Protobuf/ProtobufNoSugar.cs | 143 +++++++++--------- NoSugarNet.ServerCore/Common/Config.cs | 17 +++ .../Manager/LocalClientManager.cs | 32 ++-- NoSugarNet.ServerCore/Manager/LoginManager.cs | 11 +- .../ServerLocalClient/ServerLocalClient.cs | 4 +- .../Manager/ServerManager.cs | 7 +- .../Protobuf/ProtobufNoSugar.cs | 143 +++++++++--------- ProtobufCore/out/CS/ProtobufNoSugar.cs | 143 +++++++++--------- ProtobufCore/proto/protobuf_NoSugar.proto | 4 +- Sample/NoSugarNet.ClientCli/Program.cs | 4 + Sample/NoSugarNet.ServerCli/Config.cs | 48 ++++++ .../NoSugarNet.ServerCli.csproj | 8 + Sample/NoSugarNet.ServerCli/Program.cs | 9 +- Sample/NoSugarNet.ServerCli/config.cfg | 4 + 21 files changed, 367 insertions(+), 249 deletions(-) create mode 100644 NoSugarNet.ServerCore/Common/Config.cs create mode 100644 Sample/NoSugarNet.ServerCli/Config.cs create mode 100644 Sample/NoSugarNet.ServerCli/config.cfg diff --git a/Lib/HaoYueNet.ClientNetwork.dll b/Lib/HaoYueNet.ClientNetwork.dll index bda3d917c947a4513a757bf015842ffb6ae7222f..6eb54c8ae17ce4128b93c00e88b38a1736ec67f7 100644 GIT binary patch delta 942 zcmX}rPe>F|90&04%-cURo7ArPFEz41+JDr{b+_HpT-#PdQ}fT(mIQ%ThwNae3GQyf zmXOst8HgL?Av91z#)CqKz%UFUsDsva@KA?}7Am}mhu)icIWULM`@Q%3z4^j~VnQe; zJi2EHPPM#@-k&gzw*n1Hw9>6~3+cjhB`S0ZU8*eZ*g~=2)|f2z8~_Zthe_T+Q+oR# zU{ZQ*UIFTyZCFZ{(h8Tv9yi@#PLtY;0E==X^N2oQ!R36==M7d2COD8(z!XN3 zoI)IMbG?^LaN;Icwk3r)(XT0jZo2ar9_y0&gg)ZJB9}tthM|!4j7ZbyC&%IDnx{H} zjv!}3d`L<$!L>$JhOb?3*`(K1BJQKu;km&F7Ry7e0V(u;Z!<~1L^s0T5w zcZS=jz#jVj^fK6FvEmd;ih??~$zy^SrFt>ruGs`H>NQ0(2F$yN7hU{dvz$kTqwHK5 zKc#$f1|7vrdWO{)*Q94yjb$#DVGWY(`Z<(gH iw{rO6=l_eeQNZ;fXK*Gf+K_3SU829^HFa~JHKESE_t1s&@HxM8e!s&PZu^kXJ|y&Z znP0kkW}@AraeYld6}?~Prfouk5T#M!lF+D1rmY(VO4DrBwAbcU-`WO6yXmSMFk9or z3ps!+#%Hb3j-+&IcRJO{qo;2;#10vnHYvVucM z$q5^6#t*R2+KQLHPP*kj#JylCVXYowh_-*tuYP0S!iP`^j(Vr1w;pDrUq zA7WfuhUHl1(lRWEEf3oK2rgP3qyou#`eRs#w}>BAT$Jf3y16DWOpYPOHN{kkHLgX| z2&qDDzR_issTwU@OVSuQj=NkYd5qNH9TS^xgjfrqK)w=nAkD-8 diff --git a/Lib/HaoYueNet.ServerNetwork.dll b/Lib/HaoYueNet.ServerNetwork.dll index 86b01ec7694ba98d8ed66eac6bc483c926f14118..d448aebf513d475e703dad04720c2cb73c1721b4 100644 GIT binary patch literal 24576 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 M$+zM8`Jes#A6T?x6951J literal 25088 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 - for (int i = 0;msg.Cfgs.Count > 0;i++) + for (int i = 0;i < msg.Cfgs.Count;i++) { Protobuf_Cfgs_Single cfg = msg.Cfgs[i]; mDictTunnelID2Cfg[(byte)cfg.TunnelID] = cfg; @@ -110,7 +111,10 @@ namespace ServerCore.Manager { AppNoSugarNet.log.Debug("Recive_TunnelS2CConnect"); Protobuf_S2C_Connect msg = ProtoBufHelper.DeSerizlize(reqData); - OnServerLocalConnect((byte)msg.TunnelID,(byte)msg.Idx); + if(msg.Connected == 1) + OnServerLocalConnect((byte)msg.TunnelID,(byte)msg.Idx); + else + OnServerLocalDisconnect((byte)msg.TunnelID, (byte)msg.Idx); } public void Recive_TunnelS2CDisconnect(byte[] reqData) { @@ -134,6 +138,7 @@ namespace ServerCore.Manager /// public void OnClientLocalConnect(byte tunnelId,byte _Idx) { + AppNoSugarNet.log.Debug($"OnClientLocalConnect {tunnelId},{_Idx}"); if (!mDictTunnelID2Cfg.ContainsKey(tunnelId)) return; @@ -153,6 +158,7 @@ namespace ServerCore.Manager /// public void OnClientLocalDisconnect(byte tunnelId, byte _Idx) { + AppNoSugarNet.log.Debug($"OnClientLocalDisconnect {tunnelId},{_Idx}"); //隧道ID定位投递服务端本地连接 if (!mDictTunnelID2Cfg.ContainsKey(tunnelId)) return; @@ -162,6 +168,7 @@ namespace ServerCore.Manager TunnelID = tunnelId, Idx= _Idx, }); + //告知给服务端，来自客户端本地的连接断开 AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SDisconnect, respData); } @@ -171,6 +178,7 @@ namespace ServerCore.Manager /// public void OnServerLocalConnect(byte tunnelId,byte Idx) { + AppNoSugarNet.log.Debug($"OnServerLocalConnect {tunnelId},{Idx}"); if (!GetLocalListener(tunnelId, out LocalListener _listener)) return; //维护状态 @@ -179,8 +187,11 @@ namespace ServerCore.Manager { for(int i = 0; i < msglist.Count; i++) { + IdxWithMsg msg = msglist[i]; //投递给服务端，来自客户端本地的连接数据 - AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SData, msglist[i].data); + AppNoSugarNet.networkHelper.SendToServer((int)CommandID.CmdTunnelC2SData, msg.data); + //发送后回收 + AppNoSugarNet.local._localMsgPool.Enqueue(msg); } } } @@ -191,6 +202,7 @@ namespace ServerCore.Manager /// public void OnServerLocalDisconnect(byte tunnelId, byte Idx) { + AppNoSugarNet.log.Debug($"OnServerLocalDisconnect {tunnelId},{Idx}"); if (!GetLocalListener(tunnelId, out LocalListener _listener)) return; @@ -208,6 +220,7 @@ namespace ServerCore.Manager /// public void OnServerLocalDataCallBack(byte tunnelId,byte Idx, byte[] data) { + AppNoSugarNet.log.Debug($"OnServerLocalDataCallBack {tunnelId},{Idx}"); if (!GetLocalListener(tunnelId, out LocalListener _listener)) return; //解压 @@ -222,6 +235,7 @@ namespace ServerCore.Manager /// public void OnClientTunnelDataCallBack(byte tunnelId,byte Idx, byte[] data) { + AppNoSugarNet.log.Debug($"OnClientTunnelDataCallBack {tunnelId},{Idx}"); //压缩 data = mCompressAdapter.Compress(data); byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_C2S_DATA() diff --git a/NoSugarNet.ClientCore/Manager/LocalClient/LocalListener.cs b/NoSugarNet.ClientCore/Manager/LocalClient/LocalListener.cs index b5341aa..8cb7abd 100644 --- a/NoSugarNet.ClientCore/Manager/LocalClient/LocalListener.cs +++ b/NoSugarNet.ClientCore/Manager/LocalClient/LocalListener.cs @@ -1,7 +1,5 @@ using HaoYueNet.ServerNetwork; -using NoSugarNet.ClientCore.Network; using System.Net.Sockets; -using static System.Runtime.InteropServices.JavaScript.JSType; namespace NoSugarNet.ClientCore { @@ -89,7 +87,7 @@ namespace NoSugarNet.ClientCore /// public void OnDisconnect(AsyncUserToken token) { - Console.WriteLine("断开连接"); + AppNoSugarNet.log.Debug("断开连接"); if (!GetSocketIdxBySocket(token.Socket, out int Idx)) return; @@ -251,7 +249,6 @@ namespace NoSugarNet.ClientCore { IdxWithMsg msg = _localClientInfo.msgQueue.Dequeue(); MsgList.Add(msg); - AppNoSugarNet.local._localMsgPool.Enqueue(msg); } return true; } diff --git a/NoSugarNet.ClientCore/Network/NetMsg.cs b/NoSugarNet.ClientCore/Network/NetMsg.cs index b6bb12a..cfc729d 100644 --- a/NoSugarNet.ClientCore/Network/NetMsg.cs +++ b/NoSugarNet.ClientCore/Network/NetMsg.cs @@ -66,7 +66,7 @@ } catch (Exception e) { - App.log.Error(e.Message); + AppNoSugarNet.log.Error(e.Message); } } } diff --git a/NoSugarNet.ClientCore/Protobuf/ProtobufNoSugar.cs b/NoSugarNet.ClientCore/Protobuf/ProtobufNoSugar.cs index 44acd31..549e751 100644 --- a/NoSugarNet.ClientCore/Protobuf/ProtobufNoSugar.cs +++ b/NoSugarNet.ClientCore/Protobuf/ProtobufNoSugar.cs @@ -32,42 +32,43 @@ namespace AxibugProtobuf { "CRIVCg1MYXN0TG9naW5EYXRlGAIgASgJEg8KB1JlZ0RhdGUYAyABKAkSMQoG", "U3RhdHVzGAQgASgOMiEuQXhpYnVnUHJvdG9idWYuTG9naW5SZXN1bHRTdGF0", "dXMiQwoNUHJvdG9idWZfQ2ZncxIyCgRjZmdzGAEgAygLMiQuQXhpYnVnUHJv", - "dG9idWYuUHJvdG9idWZfQ2Znc19TaW5nbGUiQgoUUHJvdG9idWZfQ2Znc19T", - "aW5nbGUSEAoIVHVubmVsSUQYASABKA0SCgoCSVAYAiABKAkSDAoEUG9ydBgD", - "IAEoBSIjChBQcm90b2J1Zl9DaGF0TXNnEg8KB0NoYXRNc2cYASABKAkiSAoV", - "UHJvdG9idWZfQ2hhdE1zZ19SRVNQEhAKCE5pY2tOYW1lGAEgASgJEg8KB0No", - "YXRNc2cYAiABKAkSDAoERGF0ZRgDIAEoAyI1ChRQcm90b2J1Zl9DMlNfQ29u", - "bmVjdBIQCghUdW5uZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iNQoUUHJvdG9i", - "dWZfUzJDX0Nvbm5lY3QSEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgN", - "IjgKF1Byb3RvYnVmX0MyU19EaXNjb25uZWN0EhAKCFR1bm5lbElEGAEgASgN", - "EgsKA0lkeBgCIAEoDSI4ChdQcm90b2J1Zl9TMkNfRGlzY29ubmVjdBIQCghU", - "dW5uZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iTgoRUHJvdG9idWZfQzJTX0RB", - "VEESEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNEhoKEkh1bnRlck5l", - "dENvcmVfRGF0YRgDIAEoDCJOChFQcm90b2J1Zl9TMkNfREFUQRIQCghUdW5u", - "ZWxJRBgBIAEoDRILCgNJZHgYAiABKA0SGgoSSHVudGVyTmV0Q29yZV9EYXRh", - "GAMgASgMKvoBCglDb21tYW5kSUQSDgoKQ01EX0RFRkFVTBAAEg4KCUNNRF9M", - "T0dJThDRDxINCghDTURfQ0ZHUxC5FxIQCgtDTURfQ0hBVE1TRxChHxIbChZD", - "TURfVFVOTkVMX0MyU19DT05ORUNUEIgnEhsKFkNNRF9UVU5ORUxfUzJDX0NP", - "Tk5FQ1QQiScSHgoZQ01EX1RVTk5FTF9DMlNfRElTQ09OTkVDVBCKJxIeChlD", - "TURfVFVOTkVMX1MyQ19ESVNDT05ORUNUEIsnEhgKE0NNRF9UVU5ORUxfQzJT", - "X0RBVEEQjCcSGAoTQ01EX1RVTk5FTF9TMkNfREFUQRCNJyorCglFcnJvckNv", - "ZGUSEAoMRVJST1JfREVGQVVMEAASDAoIRVJST1JfT0sQASo+CglMb2dpblR5", - "cGUSDwoLQmFzZURlZmF1bHQQABIOCgpIYW9ZdWVBdXRoEAESBwoDQkYzEAMS", - "BwoDQkY0EAQqSwoKRGV2aWNlVHlwZRIWChJEZXZpY2VUeXBlX0RlZmF1bHQQ", - "ABIGCgJQQxABEgsKB0FuZHJvaWQQAhIHCgNJT1MQAxIHCgNQU1YQBCpOChFM", - "b2dpblJlc3VsdFN0YXR1cxIhCh1Mb2dpblJlc3VsdFN0YXR1c19CYXNlRGVm", - "YXVsdBAAEgYKAk9LEAESDgoKQWNjb3VudEVychACQgJIAWIGcHJvdG8z")); + "dG9idWYuUHJvdG9idWZfQ2Znc19TaW5nbGUiNgoUUHJvdG9idWZfQ2Znc19T", + "aW5nbGUSEAoIVHVubmVsSUQYASABKA0SDAoEUG9ydBgCIAEoBSIjChBQcm90", + "b2J1Zl9DaGF0TXNnEg8KB0NoYXRNc2cYASABKAkiSAoVUHJvdG9idWZfQ2hh", + "dE1zZ19SRVNQEhAKCE5pY2tOYW1lGAEgASgJEg8KB0NoYXRNc2cYAiABKAkS", + "DAoERGF0ZRgDIAEoAyI1ChRQcm90b2J1Zl9DMlNfQ29ubmVjdBIQCghUdW5u", + "ZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iSAoUUHJvdG9idWZfUzJDX0Nvbm5l", + "Y3QSEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNEhEKCUNvbm5lY3Rl", + "ZBgDIAEoDSI4ChdQcm90b2J1Zl9DMlNfRGlzY29ubmVjdBIQCghUdW5uZWxJ", + "RBgBIAEoDRILCgNJZHgYAiABKA0iOAoXUHJvdG9idWZfUzJDX0Rpc2Nvbm5l", + "Y3QSEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNIk4KEVByb3RvYnVm", + "X0MyU19EQVRBEhAKCFR1bm5lbElEGAEgASgNEgsKA0lkeBgCIAEoDRIaChJI", + "dW50ZXJOZXRDb3JlX0RhdGEYAyABKAwiTgoRUHJvdG9idWZfUzJDX0RBVEES", + "EAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNEhoKEkh1bnRlck5ldENv", + "cmVfRGF0YRgDIAEoDCr6AQoJQ29tbWFuZElEEg4KCkNNRF9ERUZBVUwQABIO", + "CglDTURfTE9HSU4Q0Q8SDQoIQ01EX0NGR1MQuRcSEAoLQ01EX0NIQVRNU0cQ", + "oR8SGwoWQ01EX1RVTk5FTF9DMlNfQ09OTkVDVBCIJxIbChZDTURfVFVOTkVM", + "X1MyQ19DT05ORUNUEIknEh4KGUNNRF9UVU5ORUxfQzJTX0RJU0NPTk5FQ1QQ", + "iicSHgoZQ01EX1RVTk5FTF9TMkNfRElTQ09OTkVDVBCLJxIYChNDTURfVFVO", + "TkVMX0MyU19EQVRBEIwnEhgKE0NNRF9UVU5ORUxfUzJDX0RBVEEQjScqKwoJ", + "RXJyb3JDb2RlEhAKDEVSUk9SX0RFRkFVTBAAEgwKCEVSUk9SX09LEAEqPgoJ", + "TG9naW5UeXBlEg8KC0Jhc2VEZWZhdWx0EAASDgoKSGFvWXVlQXV0aBABEgcK", + "A0JGMxADEgcKA0JGNBAEKksKCkRldmljZVR5cGUSFgoSRGV2aWNlVHlwZV9E", + "ZWZhdWx0EAASBgoCUEMQARILCgdBbmRyb2lkEAISBwoDSU9TEAMSBwoDUFNW", + "EAQqTgoRTG9naW5SZXN1bHRTdGF0dXMSIQodTG9naW5SZXN1bHRTdGF0dXNf", + "QmFzZURlZmF1bHQQABIGCgJPSxABEg4KCkFjY291bnRFcnIQAkICSAFiBnBy", + "b3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Login), global::AxibugProtobuf.Protobuf_Login.Parser, new[]{ "LoginType", "DeviceType", "Account", "Password" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Login_RESP), global::AxibugProtobuf.Protobuf_Login_RESP.Parser, new[]{ "Token", "LastLoginDate", "RegDate", "Status" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs), global::AxibugProtobuf.Protobuf_Cfgs.Parser, new[]{ "Cfgs" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs_Single), global::AxibugProtobuf.Protobuf_Cfgs_Single.Parser, new[]{ "TunnelID", "IP", "Port" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs_Single), global::AxibugProtobuf.Protobuf_Cfgs_Single.Parser, new[]{ "TunnelID", "Port" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_ChatMsg), global::AxibugProtobuf.Protobuf_ChatMsg.Parser, new[]{ "ChatMsg" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_ChatMsg_RESP), global::AxibugProtobuf.Protobuf_ChatMsg_RESP.Parser, new[]{ "NickName", "ChatMsg", "Date" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Connect), global::AxibugProtobuf.Protobuf_C2S_Connect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Connect), global::AxibugProtobuf.Protobuf_S2C_Connect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Connect), global::AxibugProtobuf.Protobuf_S2C_Connect.Parser, new[]{ "TunnelID", "Idx", "Connected" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Disconnect), global::AxibugProtobuf.Protobuf_C2S_Disconnect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Disconnect), global::AxibugProtobuf.Protobuf_S2C_Disconnect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_DATA), global::AxibugProtobuf.Protobuf_C2S_DATA.Parser, new[]{ "TunnelID", "Idx", "HunterNetCoreData" }, null, null, null, null), @@ -952,7 +953,6 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_Cfgs_Single(Protobuf_Cfgs_Single other) : this() { tunnelID_ = other.tunnelID_; - iP_ = other.iP_; port_ = other.port_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -976,22 +976,8 @@ namespace AxibugProtobuf { } } - /// Field number for the "IP" field. - public const int IPFieldNumber = 2; - private string iP_ = ""; - /// - ///IP - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string IP { - get { return iP_; } - set { - iP_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - /// Field number for the "Port" field. - public const int PortFieldNumber = 3; + public const int PortFieldNumber = 2; private int port_; /// ///端口 @@ -1018,7 +1004,6 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; - if (IP != other.IP) return false; if (Port != other.Port) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1027,7 +1012,6 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); - if (IP.Length != 0) hash ^= IP.GetHashCode(); if (Port != 0) hash ^= Port.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -1049,12 +1033,8 @@ namespace AxibugProtobuf { output.WriteRawTag(8); output.WriteUInt32(TunnelID); } - if (IP.Length != 0) { - output.WriteRawTag(18); - output.WriteString(IP); - } if (Port != 0) { - output.WriteRawTag(24); + output.WriteRawTag(16); output.WriteInt32(Port); } if (_unknownFields != null) { @@ -1070,12 +1050,8 @@ namespace AxibugProtobuf { output.WriteRawTag(8); output.WriteUInt32(TunnelID); } - if (IP.Length != 0) { - output.WriteRawTag(18); - output.WriteString(IP); - } if (Port != 0) { - output.WriteRawTag(24); + output.WriteRawTag(16); output.WriteInt32(Port); } if (_unknownFields != null) { @@ -1090,9 +1066,6 @@ namespace AxibugProtobuf { if (TunnelID != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); } - if (IP.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(IP); - } if (Port != 0) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(Port); } @@ -1110,9 +1083,6 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } - if (other.IP.Length != 0) { - IP = other.IP; - } if (other.Port != 0) { Port = other.Port; } @@ -1134,11 +1104,7 @@ namespace AxibugProtobuf { TunnelID = input.ReadUInt32(); break; } - case 18: { - IP = input.ReadString(); - break; - } - case 24: { + case 16: { Port = input.ReadInt32(); break; } @@ -1160,11 +1126,7 @@ namespace AxibugProtobuf { TunnelID = input.ReadUInt32(); break; } - case 18: { - IP = input.ReadString(); - break; - } - case 24: { + case 16: { Port = input.ReadInt32(); break; } @@ -1854,6 +1816,7 @@ namespace AxibugProtobuf { public Protobuf_S2C_Connect(Protobuf_S2C_Connect other) : this() { tunnelID_ = other.tunnelID_; idx_ = other.idx_; + connected_ = other.connected_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1890,6 +1853,20 @@ namespace AxibugProtobuf { } } + /// Field number for the "Connected" field. + public const int ConnectedFieldNumber = 3; + private uint connected_; + /// + ///[0]连接失败 [1]连接成功 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Connected { + get { return connected_; } + set { + connected_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Protobuf_S2C_Connect); @@ -1905,6 +1882,7 @@ namespace AxibugProtobuf { } if (TunnelID != other.TunnelID) return false; if (Idx != other.Idx) return false; + if (Connected != other.Connected) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1913,6 +1891,7 @@ namespace AxibugProtobuf { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); if (Idx != 0) hash ^= Idx.GetHashCode(); + if (Connected != 0) hash ^= Connected.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1937,6 +1916,10 @@ namespace AxibugProtobuf { output.WriteRawTag(16); output.WriteUInt32(Idx); } + if (Connected != 0) { + output.WriteRawTag(24); + output.WriteUInt32(Connected); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -1954,6 +1937,10 @@ namespace AxibugProtobuf { output.WriteRawTag(16); output.WriteUInt32(Idx); } + if (Connected != 0) { + output.WriteRawTag(24); + output.WriteUInt32(Connected); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -1969,6 +1956,9 @@ namespace AxibugProtobuf { if (Idx != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } + if (Connected != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Connected); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -1986,6 +1976,9 @@ namespace AxibugProtobuf { if (other.Idx != 0) { Idx = other.Idx; } + if (other.Connected != 0) { + Connected = other.Connected; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -2008,6 +2001,10 @@ namespace AxibugProtobuf { Idx = input.ReadUInt32(); break; } + case 24: { + Connected = input.ReadUInt32(); + break; + } } } #endif @@ -2030,6 +2027,10 @@ namespace AxibugProtobuf { Idx = input.ReadUInt32(); break; } + case 24: { + Connected = input.ReadUInt32(); + break; + } } } } diff --git a/NoSugarNet.ServerCore/Common/Config.cs b/NoSugarNet.ServerCore/Common/Config.cs new file mode 100644 index 0000000..cb75673 --- /dev/null +++ b/NoSugarNet.ServerCore/Common/Config.cs @@ -0,0 +1,17 @@ +using System.Text; + +namespace NoSugarNet.ServerCore.Common +{ + public struct TunnelClientData + { + public byte TunnelId; + public string ServerLocalIP; + public ushort ServerLocalPort; + public ushort ClientLocalPort; + } + + public static class Config + { + public static Dictionary Cfgs = new Dictionary(); + } +} diff --git a/NoSugarNet.ServerCore/Manager/LocalClientManager.cs b/NoSugarNet.ServerCore/Manager/LocalClientManager.cs index 345caee..39575e9 100644 --- a/NoSugarNet.ServerCore/Manager/LocalClientManager.cs +++ b/NoSugarNet.ServerCore/Manager/LocalClientManager.cs @@ -10,13 +10,6 @@ namespace ServerCore.Manager { public class LocalClientManager { - struct TunnelClientData - { - public string IP; - public ushort Port; - } - - Dictionary mDictTunnelID2Cfg = new Dictionary(); Dictionary mDictCommKey2ServerLocalClients = new Dictionary(); CompressAdapter mCompressAdapter; @@ -115,23 +108,32 @@ namespace ServerCore.Manager /// void OnClientLocalConnect(long uid, byte tunnelId,int Idx) { + ServerManager.g_Log.Debug($"OnClientLocalConnect {uid},{tunnelId},{Idx}"); if (!ServerManager.g_ClientMgr.GetClientByUID(uid, out ClientInfo client)) return; - if (!mDictTunnelID2Cfg.ContainsKey(tunnelId)) + if (!Config.Cfgs.ContainsKey(tunnelId)) return; //开一个线程去建立连接 Thread thread = new Thread(() => { //服务器本地局域网连接指定端口 - TunnelClientData tunnelDataCfg = mDictTunnelID2Cfg[tunnelId]; - ServerLocalClient serverLocalClient = new ServerLocalClient(tunnelId, (byte)Idx); + TunnelClientData tunnelDataCfg = Config.Cfgs[tunnelId]; + ServerLocalClient serverLocalClient = new ServerLocalClient(uid, tunnelId, (byte)Idx); //连接成功 - if (!serverLocalClient.Init(tunnelDataCfg.IP, tunnelDataCfg.Port)) + if (!serverLocalClient.Init(tunnelDataCfg.ServerLocalIP, tunnelDataCfg.ServerLocalPort)) { - //连接失败 //TODO告知客户端连接失败 + + byte[] respData = ProtoBufHelper.Serizlize(new Protobuf_S2C_Connect() + { + TunnelID = tunnelId, + Idx = (uint)Idx, + Connected = 0//失败 + }); + //发送给客户端，指定服务端本地端口已连接 + ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CConnect, (int)ErrorCode.ErrorOk, respData); } }); thread.Start(); @@ -143,6 +145,7 @@ namespace ServerCore.Manager /// void OnClientLocalDisconnect(long uid, byte tunnelId,byte Idx) { + ServerManager.g_Log.Debug($"OnClientLocalDisconnect {uid},{tunnelId},{Idx}"); if (!ServerManager.g_ClientMgr.GetClientByUID(uid, out ClientInfo client)) return; @@ -162,6 +165,7 @@ namespace ServerCore.Manager /// public void OnServerLocalConnect(long uid, byte tunnelId, byte Idx, ServerLocalClient serverLocalClient) { + ServerManager.g_Log.Debug($"OnServerLocalConnect {uid},{tunnelId},{Idx}"); if (!ServerManager.g_ClientMgr.GetClientByUID(uid, out ClientInfo client)) return; @@ -172,6 +176,7 @@ namespace ServerCore.Manager { TunnelID = tunnelId, Idx = Idx, + Connected = 1 }); //发送给客户端，指定服务端本地端口已连接 ServerManager.g_ClientMgr.ClientSend(client, (int)CommandID.CmdTunnelS2CConnect, (int)ErrorCode.ErrorOk, respData); @@ -183,6 +188,7 @@ namespace ServerCore.Manager /// public void OnServerLocalDisconnect(long uid, byte tunnelId, byte Idx, ServerLocalClient serverLocalClient) { + ServerManager.g_Log.Debug($"OnServerLocalDisconnect {uid},{tunnelId},{Idx}"); if (!ServerManager.g_ClientMgr.GetClientByUID(uid, out ClientInfo client)) return; //添加到服务端本地连接列表 @@ -207,6 +213,7 @@ namespace ServerCore.Manager /// public void OnServerLocalDataCallBack(long uid, byte tunnelId,byte Idx, byte[] data) { + ServerManager.g_Log.Debug($"OnServerLocalDataCallBack {uid},{tunnelId},{Idx}"); if (!ServerManager.g_ClientMgr.GetClientByUID(uid, out ClientInfo client)) return; @@ -230,6 +237,7 @@ namespace ServerCore.Manager /// public void OnClientTunnelDataCallBack(long uid, byte tunnelId, byte Idx, byte[] data) { + ServerManager.g_Log.Debug($"OnClientTunnelDataCallBack {uid},{tunnelId},{Idx}"); //隧道ID定位投递服务端本地连接 if (!GetServerLocalClient(uid, tunnelId, Idx, out ServerLocalClient serverLocalClient)) return; diff --git a/NoSugarNet.ServerCore/Manager/LoginManager.cs b/NoSugarNet.ServerCore/Manager/LoginManager.cs index c5501ee..55f22cb 100644 --- a/NoSugarNet.ServerCore/Manager/LoginManager.cs +++ b/NoSugarNet.ServerCore/Manager/LoginManager.cs @@ -1,4 +1,5 @@ using AxibugProtobuf; +using NoSugarNet.ServerCore.Common; using ServerCore.Common; using ServerCore.NetWork; using System.Net.Sockets; @@ -29,10 +30,12 @@ namespace ServerCore.Manager ServerManager.g_ClientMgr.ClientSend(cinfo, (int)CommandID.CmdLogin, (int)ErrorCode.ErrorOk, respData); Protobuf_Cfgs cfgsSP = new Protobuf_Cfgs(); - cfgsSP.Cfgs.Add(new Protobuf_Cfgs_Single { TunnelID = 0, IP = "127.0.0.1", Port = 10001 }); - cfgsSP.Cfgs.Add(new Protobuf_Cfgs_Single { TunnelID = 1, IP = "127.0.0.1", Port = 10002 }); - cfgsSP.Cfgs.Add(new Protobuf_Cfgs_Single { TunnelID = 2, IP = "127.0.0.1", Port = 10003 }); - cfgsSP.Cfgs.Add(new Protobuf_Cfgs_Single { TunnelID = 3, IP = "127.0.0.1", Port = 10004 }); + byte[] keys = Config.Cfgs.Keys.ToArray(); + for (int i = 0; i < Config.Cfgs.Count; i++) + { + TunnelClientData cfg = Config.Cfgs[keys[i]]; + cfgsSP.Cfgs.Add(new Protobuf_Cfgs_Single() { TunnelID = cfg.TunnelId, Port = cfg.ClientLocalPort }); + } byte[] respDataCfg = ProtoBufHelper.Serizlize(cfgsSP); ServerManager.g_ClientMgr.ClientSend(cinfo, (int)CommandID.CmdCfgs, (int)ErrorCode.ErrorOk, respDataCfg); diff --git a/NoSugarNet.ServerCore/Manager/ServerLocalClient/ServerLocalClient.cs b/NoSugarNet.ServerCore/Manager/ServerLocalClient/ServerLocalClient.cs index 8adf70f..ed9275d 100644 --- a/NoSugarNet.ServerCore/Manager/ServerLocalClient/ServerLocalClient.cs +++ b/NoSugarNet.ServerCore/Manager/ServerLocalClient/ServerLocalClient.cs @@ -1,5 +1,6 @@ using HaoYueNet.ClientNetwork.OtherMode; using ServerCore.Manager; +using System; namespace NoSugarNet.ClientCore.Network { @@ -11,8 +12,9 @@ namespace NoSugarNet.ClientCore.Network public long mUID; public byte mTunnelID; public byte mIdx; - public ServerLocalClient(byte TunnelID, byte Idx) + public ServerLocalClient(long UID,byte TunnelID, byte Idx) { + mUID = UID; mTunnelID = TunnelID; mIdx = Idx; //指定接收服务器数据事件 diff --git a/NoSugarNet.ServerCore/Manager/ServerManager.cs b/NoSugarNet.ServerCore/Manager/ServerManager.cs index 4a7dc96..c9fe2ed 100644 --- a/NoSugarNet.ServerCore/Manager/ServerManager.cs +++ b/NoSugarNet.ServerCore/Manager/ServerManager.cs @@ -1,4 +1,6 @@ -using ServerCore.NetWork; +using NoSugarNet.ServerCore.Common; +using ServerCore.NetWork; +using ServerCore.Common; using System.Net; namespace ServerCore.Manager @@ -12,8 +14,9 @@ namespace ServerCore.Manager public static LocalClientManager g_Local; public static IOCPNetWork g_SocketMgr; - public static void InitServer(int port) + public static void InitServer(int port, Dictionary cfgs) { + Config.Cfgs = cfgs; g_ClientMgr = new ClientManager(); g_ClientMgr.Init(45000, 120); g_Log = new LogManager(); diff --git a/NoSugarNet.ServerCore/Protobuf/ProtobufNoSugar.cs b/NoSugarNet.ServerCore/Protobuf/ProtobufNoSugar.cs index 44acd31..549e751 100644 --- a/NoSugarNet.ServerCore/Protobuf/ProtobufNoSugar.cs +++ b/NoSugarNet.ServerCore/Protobuf/ProtobufNoSugar.cs @@ -32,42 +32,43 @@ namespace AxibugProtobuf { "CRIVCg1MYXN0TG9naW5EYXRlGAIgASgJEg8KB1JlZ0RhdGUYAyABKAkSMQoG", "U3RhdHVzGAQgASgOMiEuQXhpYnVnUHJvdG9idWYuTG9naW5SZXN1bHRTdGF0", "dXMiQwoNUHJvdG9idWZfQ2ZncxIyCgRjZmdzGAEgAygLMiQuQXhpYnVnUHJv", - "dG9idWYuUHJvdG9idWZfQ2Znc19TaW5nbGUiQgoUUHJvdG9idWZfQ2Znc19T", - "aW5nbGUSEAoIVHVubmVsSUQYASABKA0SCgoCSVAYAiABKAkSDAoEUG9ydBgD", - "IAEoBSIjChBQcm90b2J1Zl9DaGF0TXNnEg8KB0NoYXRNc2cYASABKAkiSAoV", - "UHJvdG9idWZfQ2hhdE1zZ19SRVNQEhAKCE5pY2tOYW1lGAEgASgJEg8KB0No", - "YXRNc2cYAiABKAkSDAoERGF0ZRgDIAEoAyI1ChRQcm90b2J1Zl9DMlNfQ29u", - "bmVjdBIQCghUdW5uZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iNQoUUHJvdG9i", - "dWZfUzJDX0Nvbm5lY3QSEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgN", - "IjgKF1Byb3RvYnVmX0MyU19EaXNjb25uZWN0EhAKCFR1bm5lbElEGAEgASgN", - "EgsKA0lkeBgCIAEoDSI4ChdQcm90b2J1Zl9TMkNfRGlzY29ubmVjdBIQCghU", - "dW5uZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iTgoRUHJvdG9idWZfQzJTX0RB", - "VEESEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNEhoKEkh1bnRlck5l", - "dENvcmVfRGF0YRgDIAEoDCJOChFQcm90b2J1Zl9TMkNfREFUQRIQCghUdW5u", - "ZWxJRBgBIAEoDRILCgNJZHgYAiABKA0SGgoSSHVudGVyTmV0Q29yZV9EYXRh", - "GAMgASgMKvoBCglDb21tYW5kSUQSDgoKQ01EX0RFRkFVTBAAEg4KCUNNRF9M", - "T0dJThDRDxINCghDTURfQ0ZHUxC5FxIQCgtDTURfQ0hBVE1TRxChHxIbChZD", - "TURfVFVOTkVMX0MyU19DT05ORUNUEIgnEhsKFkNNRF9UVU5ORUxfUzJDX0NP", - "Tk5FQ1QQiScSHgoZQ01EX1RVTk5FTF9DMlNfRElTQ09OTkVDVBCKJxIeChlD", - "TURfVFVOTkVMX1MyQ19ESVNDT05ORUNUEIsnEhgKE0NNRF9UVU5ORUxfQzJT", - "X0RBVEEQjCcSGAoTQ01EX1RVTk5FTF9TMkNfREFUQRCNJyorCglFcnJvckNv", - "ZGUSEAoMRVJST1JfREVGQVVMEAASDAoIRVJST1JfT0sQASo+CglMb2dpblR5", - "cGUSDwoLQmFzZURlZmF1bHQQABIOCgpIYW9ZdWVBdXRoEAESBwoDQkYzEAMS", - "BwoDQkY0EAQqSwoKRGV2aWNlVHlwZRIWChJEZXZpY2VUeXBlX0RlZmF1bHQQ", - "ABIGCgJQQxABEgsKB0FuZHJvaWQQAhIHCgNJT1MQAxIHCgNQU1YQBCpOChFM", - "b2dpblJlc3VsdFN0YXR1cxIhCh1Mb2dpblJlc3VsdFN0YXR1c19CYXNlRGVm", - "YXVsdBAAEgYKAk9LEAESDgoKQWNjb3VudEVychACQgJIAWIGcHJvdG8z")); + "dG9idWYuUHJvdG9idWZfQ2Znc19TaW5nbGUiNgoUUHJvdG9idWZfQ2Znc19T", + "aW5nbGUSEAoIVHVubmVsSUQYASABKA0SDAoEUG9ydBgCIAEoBSIjChBQcm90", + "b2J1Zl9DaGF0TXNnEg8KB0NoYXRNc2cYASABKAkiSAoVUHJvdG9idWZfQ2hh", + "dE1zZ19SRVNQEhAKCE5pY2tOYW1lGAEgASgJEg8KB0NoYXRNc2cYAiABKAkS", + "DAoERGF0ZRgDIAEoAyI1ChRQcm90b2J1Zl9DMlNfQ29ubmVjdBIQCghUdW5u", + "ZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iSAoUUHJvdG9idWZfUzJDX0Nvbm5l", + "Y3QSEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNEhEKCUNvbm5lY3Rl", + "ZBgDIAEoDSI4ChdQcm90b2J1Zl9DMlNfRGlzY29ubmVjdBIQCghUdW5uZWxJ", + "RBgBIAEoDRILCgNJZHgYAiABKA0iOAoXUHJvdG9idWZfUzJDX0Rpc2Nvbm5l", + "Y3QSEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNIk4KEVByb3RvYnVm", + "X0MyU19EQVRBEhAKCFR1bm5lbElEGAEgASgNEgsKA0lkeBgCIAEoDRIaChJI", + "dW50ZXJOZXRDb3JlX0RhdGEYAyABKAwiTgoRUHJvdG9idWZfUzJDX0RBVEES", + "EAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNEhoKEkh1bnRlck5ldENv", + "cmVfRGF0YRgDIAEoDCr6AQoJQ29tbWFuZElEEg4KCkNNRF9ERUZBVUwQABIO", + "CglDTURfTE9HSU4Q0Q8SDQoIQ01EX0NGR1MQuRcSEAoLQ01EX0NIQVRNU0cQ", + "oR8SGwoWQ01EX1RVTk5FTF9DMlNfQ09OTkVDVBCIJxIbChZDTURfVFVOTkVM", + "X1MyQ19DT05ORUNUEIknEh4KGUNNRF9UVU5ORUxfQzJTX0RJU0NPTk5FQ1QQ", + "iicSHgoZQ01EX1RVTk5FTF9TMkNfRElTQ09OTkVDVBCLJxIYChNDTURfVFVO", + "TkVMX0MyU19EQVRBEIwnEhgKE0NNRF9UVU5ORUxfUzJDX0RBVEEQjScqKwoJ", + "RXJyb3JDb2RlEhAKDEVSUk9SX0RFRkFVTBAAEgwKCEVSUk9SX09LEAEqPgoJ", + "TG9naW5UeXBlEg8KC0Jhc2VEZWZhdWx0EAASDgoKSGFvWXVlQXV0aBABEgcK", + "A0JGMxADEgcKA0JGNBAEKksKCkRldmljZVR5cGUSFgoSRGV2aWNlVHlwZV9E", + "ZWZhdWx0EAASBgoCUEMQARILCgdBbmRyb2lkEAISBwoDSU9TEAMSBwoDUFNW", + "EAQqTgoRTG9naW5SZXN1bHRTdGF0dXMSIQodTG9naW5SZXN1bHRTdGF0dXNf", + "QmFzZURlZmF1bHQQABIGCgJPSxABEg4KCkFjY291bnRFcnIQAkICSAFiBnBy", + "b3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Login), global::AxibugProtobuf.Protobuf_Login.Parser, new[]{ "LoginType", "DeviceType", "Account", "Password" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Login_RESP), global::AxibugProtobuf.Protobuf_Login_RESP.Parser, new[]{ "Token", "LastLoginDate", "RegDate", "Status" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs), global::AxibugProtobuf.Protobuf_Cfgs.Parser, new[]{ "Cfgs" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs_Single), global::AxibugProtobuf.Protobuf_Cfgs_Single.Parser, new[]{ "TunnelID", "IP", "Port" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs_Single), global::AxibugProtobuf.Protobuf_Cfgs_Single.Parser, new[]{ "TunnelID", "Port" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_ChatMsg), global::AxibugProtobuf.Protobuf_ChatMsg.Parser, new[]{ "ChatMsg" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_ChatMsg_RESP), global::AxibugProtobuf.Protobuf_ChatMsg_RESP.Parser, new[]{ "NickName", "ChatMsg", "Date" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Connect), global::AxibugProtobuf.Protobuf_C2S_Connect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Connect), global::AxibugProtobuf.Protobuf_S2C_Connect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Connect), global::AxibugProtobuf.Protobuf_S2C_Connect.Parser, new[]{ "TunnelID", "Idx", "Connected" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Disconnect), global::AxibugProtobuf.Protobuf_C2S_Disconnect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Disconnect), global::AxibugProtobuf.Protobuf_S2C_Disconnect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_DATA), global::AxibugProtobuf.Protobuf_C2S_DATA.Parser, new[]{ "TunnelID", "Idx", "HunterNetCoreData" }, null, null, null, null), @@ -952,7 +953,6 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_Cfgs_Single(Protobuf_Cfgs_Single other) : this() { tunnelID_ = other.tunnelID_; - iP_ = other.iP_; port_ = other.port_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -976,22 +976,8 @@ namespace AxibugProtobuf { } } - /// Field number for the "IP" field. - public const int IPFieldNumber = 2; - private string iP_ = ""; - /// - ///IP - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string IP { - get { return iP_; } - set { - iP_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - /// Field number for the "Port" field. - public const int PortFieldNumber = 3; + public const int PortFieldNumber = 2; private int port_; /// ///端口 @@ -1018,7 +1004,6 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; - if (IP != other.IP) return false; if (Port != other.Port) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1027,7 +1012,6 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); - if (IP.Length != 0) hash ^= IP.GetHashCode(); if (Port != 0) hash ^= Port.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -1049,12 +1033,8 @@ namespace AxibugProtobuf { output.WriteRawTag(8); output.WriteUInt32(TunnelID); } - if (IP.Length != 0) { - output.WriteRawTag(18); - output.WriteString(IP); - } if (Port != 0) { - output.WriteRawTag(24); + output.WriteRawTag(16); output.WriteInt32(Port); } if (_unknownFields != null) { @@ -1070,12 +1050,8 @@ namespace AxibugProtobuf { output.WriteRawTag(8); output.WriteUInt32(TunnelID); } - if (IP.Length != 0) { - output.WriteRawTag(18); - output.WriteString(IP); - } if (Port != 0) { - output.WriteRawTag(24); + output.WriteRawTag(16); output.WriteInt32(Port); } if (_unknownFields != null) { @@ -1090,9 +1066,6 @@ namespace AxibugProtobuf { if (TunnelID != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); } - if (IP.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(IP); - } if (Port != 0) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(Port); } @@ -1110,9 +1083,6 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } - if (other.IP.Length != 0) { - IP = other.IP; - } if (other.Port != 0) { Port = other.Port; } @@ -1134,11 +1104,7 @@ namespace AxibugProtobuf { TunnelID = input.ReadUInt32(); break; } - case 18: { - IP = input.ReadString(); - break; - } - case 24: { + case 16: { Port = input.ReadInt32(); break; } @@ -1160,11 +1126,7 @@ namespace AxibugProtobuf { TunnelID = input.ReadUInt32(); break; } - case 18: { - IP = input.ReadString(); - break; - } - case 24: { + case 16: { Port = input.ReadInt32(); break; } @@ -1854,6 +1816,7 @@ namespace AxibugProtobuf { public Protobuf_S2C_Connect(Protobuf_S2C_Connect other) : this() { tunnelID_ = other.tunnelID_; idx_ = other.idx_; + connected_ = other.connected_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1890,6 +1853,20 @@ namespace AxibugProtobuf { } } + /// Field number for the "Connected" field. + public const int ConnectedFieldNumber = 3; + private uint connected_; + /// + ///[0]连接失败 [1]连接成功 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Connected { + get { return connected_; } + set { + connected_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Protobuf_S2C_Connect); @@ -1905,6 +1882,7 @@ namespace AxibugProtobuf { } if (TunnelID != other.TunnelID) return false; if (Idx != other.Idx) return false; + if (Connected != other.Connected) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1913,6 +1891,7 @@ namespace AxibugProtobuf { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); if (Idx != 0) hash ^= Idx.GetHashCode(); + if (Connected != 0) hash ^= Connected.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1937,6 +1916,10 @@ namespace AxibugProtobuf { output.WriteRawTag(16); output.WriteUInt32(Idx); } + if (Connected != 0) { + output.WriteRawTag(24); + output.WriteUInt32(Connected); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -1954,6 +1937,10 @@ namespace AxibugProtobuf { output.WriteRawTag(16); output.WriteUInt32(Idx); } + if (Connected != 0) { + output.WriteRawTag(24); + output.WriteUInt32(Connected); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -1969,6 +1956,9 @@ namespace AxibugProtobuf { if (Idx != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } + if (Connected != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Connected); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -1986,6 +1976,9 @@ namespace AxibugProtobuf { if (other.Idx != 0) { Idx = other.Idx; } + if (other.Connected != 0) { + Connected = other.Connected; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -2008,6 +2001,10 @@ namespace AxibugProtobuf { Idx = input.ReadUInt32(); break; } + case 24: { + Connected = input.ReadUInt32(); + break; + } } } #endif @@ -2030,6 +2027,10 @@ namespace AxibugProtobuf { Idx = input.ReadUInt32(); break; } + case 24: { + Connected = input.ReadUInt32(); + break; + } } } } diff --git a/ProtobufCore/out/CS/ProtobufNoSugar.cs b/ProtobufCore/out/CS/ProtobufNoSugar.cs index 44acd31..549e751 100644 --- a/ProtobufCore/out/CS/ProtobufNoSugar.cs +++ b/ProtobufCore/out/CS/ProtobufNoSugar.cs @@ -32,42 +32,43 @@ namespace AxibugProtobuf { "CRIVCg1MYXN0TG9naW5EYXRlGAIgASgJEg8KB1JlZ0RhdGUYAyABKAkSMQoG", "U3RhdHVzGAQgASgOMiEuQXhpYnVnUHJvdG9idWYuTG9naW5SZXN1bHRTdGF0", "dXMiQwoNUHJvdG9idWZfQ2ZncxIyCgRjZmdzGAEgAygLMiQuQXhpYnVnUHJv", - "dG9idWYuUHJvdG9idWZfQ2Znc19TaW5nbGUiQgoUUHJvdG9idWZfQ2Znc19T", - "aW5nbGUSEAoIVHVubmVsSUQYASABKA0SCgoCSVAYAiABKAkSDAoEUG9ydBgD", - "IAEoBSIjChBQcm90b2J1Zl9DaGF0TXNnEg8KB0NoYXRNc2cYASABKAkiSAoV", - "UHJvdG9idWZfQ2hhdE1zZ19SRVNQEhAKCE5pY2tOYW1lGAEgASgJEg8KB0No", - "YXRNc2cYAiABKAkSDAoERGF0ZRgDIAEoAyI1ChRQcm90b2J1Zl9DMlNfQ29u", - "bmVjdBIQCghUdW5uZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iNQoUUHJvdG9i", - "dWZfUzJDX0Nvbm5lY3QSEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgN", - "IjgKF1Byb3RvYnVmX0MyU19EaXNjb25uZWN0EhAKCFR1bm5lbElEGAEgASgN", - "EgsKA0lkeBgCIAEoDSI4ChdQcm90b2J1Zl9TMkNfRGlzY29ubmVjdBIQCghU", - "dW5uZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iTgoRUHJvdG9idWZfQzJTX0RB", - "VEESEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNEhoKEkh1bnRlck5l", - "dENvcmVfRGF0YRgDIAEoDCJOChFQcm90b2J1Zl9TMkNfREFUQRIQCghUdW5u", - "ZWxJRBgBIAEoDRILCgNJZHgYAiABKA0SGgoSSHVudGVyTmV0Q29yZV9EYXRh", - "GAMgASgMKvoBCglDb21tYW5kSUQSDgoKQ01EX0RFRkFVTBAAEg4KCUNNRF9M", - "T0dJThDRDxINCghDTURfQ0ZHUxC5FxIQCgtDTURfQ0hBVE1TRxChHxIbChZD", - "TURfVFVOTkVMX0MyU19DT05ORUNUEIgnEhsKFkNNRF9UVU5ORUxfUzJDX0NP", - "Tk5FQ1QQiScSHgoZQ01EX1RVTk5FTF9DMlNfRElTQ09OTkVDVBCKJxIeChlD", - "TURfVFVOTkVMX1MyQ19ESVNDT05ORUNUEIsnEhgKE0NNRF9UVU5ORUxfQzJT", - "X0RBVEEQjCcSGAoTQ01EX1RVTk5FTF9TMkNfREFUQRCNJyorCglFcnJvckNv", - "ZGUSEAoMRVJST1JfREVGQVVMEAASDAoIRVJST1JfT0sQASo+CglMb2dpblR5", - "cGUSDwoLQmFzZURlZmF1bHQQABIOCgpIYW9ZdWVBdXRoEAESBwoDQkYzEAMS", - "BwoDQkY0EAQqSwoKRGV2aWNlVHlwZRIWChJEZXZpY2VUeXBlX0RlZmF1bHQQ", - "ABIGCgJQQxABEgsKB0FuZHJvaWQQAhIHCgNJT1MQAxIHCgNQU1YQBCpOChFM", - "b2dpblJlc3VsdFN0YXR1cxIhCh1Mb2dpblJlc3VsdFN0YXR1c19CYXNlRGVm", - "YXVsdBAAEgYKAk9LEAESDgoKQWNjb3VudEVychACQgJIAWIGcHJvdG8z")); + "dG9idWYuUHJvdG9idWZfQ2Znc19TaW5nbGUiNgoUUHJvdG9idWZfQ2Znc19T", + "aW5nbGUSEAoIVHVubmVsSUQYASABKA0SDAoEUG9ydBgCIAEoBSIjChBQcm90", + "b2J1Zl9DaGF0TXNnEg8KB0NoYXRNc2cYASABKAkiSAoVUHJvdG9idWZfQ2hh", + "dE1zZ19SRVNQEhAKCE5pY2tOYW1lGAEgASgJEg8KB0NoYXRNc2cYAiABKAkS", + "DAoERGF0ZRgDIAEoAyI1ChRQcm90b2J1Zl9DMlNfQ29ubmVjdBIQCghUdW5u", + "ZWxJRBgBIAEoDRILCgNJZHgYAiABKA0iSAoUUHJvdG9idWZfUzJDX0Nvbm5l", + "Y3QSEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNEhEKCUNvbm5lY3Rl", + "ZBgDIAEoDSI4ChdQcm90b2J1Zl9DMlNfRGlzY29ubmVjdBIQCghUdW5uZWxJ", + "RBgBIAEoDRILCgNJZHgYAiABKA0iOAoXUHJvdG9idWZfUzJDX0Rpc2Nvbm5l", + "Y3QSEAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNIk4KEVByb3RvYnVm", + "X0MyU19EQVRBEhAKCFR1bm5lbElEGAEgASgNEgsKA0lkeBgCIAEoDRIaChJI", + "dW50ZXJOZXRDb3JlX0RhdGEYAyABKAwiTgoRUHJvdG9idWZfUzJDX0RBVEES", + "EAoIVHVubmVsSUQYASABKA0SCwoDSWR4GAIgASgNEhoKEkh1bnRlck5ldENv", + "cmVfRGF0YRgDIAEoDCr6AQoJQ29tbWFuZElEEg4KCkNNRF9ERUZBVUwQABIO", + "CglDTURfTE9HSU4Q0Q8SDQoIQ01EX0NGR1MQuRcSEAoLQ01EX0NIQVRNU0cQ", + "oR8SGwoWQ01EX1RVTk5FTF9DMlNfQ09OTkVDVBCIJxIbChZDTURfVFVOTkVM", + "X1MyQ19DT05ORUNUEIknEh4KGUNNRF9UVU5ORUxfQzJTX0RJU0NPTk5FQ1QQ", + "iicSHgoZQ01EX1RVTk5FTF9TMkNfRElTQ09OTkVDVBCLJxIYChNDTURfVFVO", + "TkVMX0MyU19EQVRBEIwnEhgKE0NNRF9UVU5ORUxfUzJDX0RBVEEQjScqKwoJ", + "RXJyb3JDb2RlEhAKDEVSUk9SX0RFRkFVTBAAEgwKCEVSUk9SX09LEAEqPgoJ", + "TG9naW5UeXBlEg8KC0Jhc2VEZWZhdWx0EAASDgoKSGFvWXVlQXV0aBABEgcK", + "A0JGMxADEgcKA0JGNBAEKksKCkRldmljZVR5cGUSFgoSRGV2aWNlVHlwZV9E", + "ZWZhdWx0EAASBgoCUEMQARILCgdBbmRyb2lkEAISBwoDSU9TEAMSBwoDUFNW", + "EAQqTgoRTG9naW5SZXN1bHRTdGF0dXMSIQodTG9naW5SZXN1bHRTdGF0dXNf", + "QmFzZURlZmF1bHQQABIGCgJPSxABEg4KCkFjY291bnRFcnIQAkICSAFiBnBy", + "b3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::AxibugProtobuf.CommandID), typeof(global::AxibugProtobuf.ErrorCode), typeof(global::AxibugProtobuf.LoginType), typeof(global::AxibugProtobuf.DeviceType), typeof(global::AxibugProtobuf.LoginResultStatus), }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Login), global::AxibugProtobuf.Protobuf_Login.Parser, new[]{ "LoginType", "DeviceType", "Account", "Password" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Login_RESP), global::AxibugProtobuf.Protobuf_Login_RESP.Parser, new[]{ "Token", "LastLoginDate", "RegDate", "Status" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs), global::AxibugProtobuf.Protobuf_Cfgs.Parser, new[]{ "Cfgs" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs_Single), global::AxibugProtobuf.Protobuf_Cfgs_Single.Parser, new[]{ "TunnelID", "IP", "Port" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_Cfgs_Single), global::AxibugProtobuf.Protobuf_Cfgs_Single.Parser, new[]{ "TunnelID", "Port" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_ChatMsg), global::AxibugProtobuf.Protobuf_ChatMsg.Parser, new[]{ "ChatMsg" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_ChatMsg_RESP), global::AxibugProtobuf.Protobuf_ChatMsg_RESP.Parser, new[]{ "NickName", "ChatMsg", "Date" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Connect), global::AxibugProtobuf.Protobuf_C2S_Connect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), - new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Connect), global::AxibugProtobuf.Protobuf_S2C_Connect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), + new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Connect), global::AxibugProtobuf.Protobuf_S2C_Connect.Parser, new[]{ "TunnelID", "Idx", "Connected" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_Disconnect), global::AxibugProtobuf.Protobuf_C2S_Disconnect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_S2C_Disconnect), global::AxibugProtobuf.Protobuf_S2C_Disconnect.Parser, new[]{ "TunnelID", "Idx" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::AxibugProtobuf.Protobuf_C2S_DATA), global::AxibugProtobuf.Protobuf_C2S_DATA.Parser, new[]{ "TunnelID", "Idx", "HunterNetCoreData" }, null, null, null, null), @@ -952,7 +953,6 @@ namespace AxibugProtobuf { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public Protobuf_Cfgs_Single(Protobuf_Cfgs_Single other) : this() { tunnelID_ = other.tunnelID_; - iP_ = other.iP_; port_ = other.port_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -976,22 +976,8 @@ namespace AxibugProtobuf { } } - /// Field number for the "IP" field. - public const int IPFieldNumber = 2; - private string iP_ = ""; - /// - ///IP - /// - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string IP { - get { return iP_; } - set { - iP_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - /// Field number for the "Port" field. - public const int PortFieldNumber = 3; + public const int PortFieldNumber = 2; private int port_; /// ///端口 @@ -1018,7 +1004,6 @@ namespace AxibugProtobuf { return true; } if (TunnelID != other.TunnelID) return false; - if (IP != other.IP) return false; if (Port != other.Port) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1027,7 +1012,6 @@ namespace AxibugProtobuf { public override int GetHashCode() { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); - if (IP.Length != 0) hash ^= IP.GetHashCode(); if (Port != 0) hash ^= Port.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); @@ -1049,12 +1033,8 @@ namespace AxibugProtobuf { output.WriteRawTag(8); output.WriteUInt32(TunnelID); } - if (IP.Length != 0) { - output.WriteRawTag(18); - output.WriteString(IP); - } if (Port != 0) { - output.WriteRawTag(24); + output.WriteRawTag(16); output.WriteInt32(Port); } if (_unknownFields != null) { @@ -1070,12 +1050,8 @@ namespace AxibugProtobuf { output.WriteRawTag(8); output.WriteUInt32(TunnelID); } - if (IP.Length != 0) { - output.WriteRawTag(18); - output.WriteString(IP); - } if (Port != 0) { - output.WriteRawTag(24); + output.WriteRawTag(16); output.WriteInt32(Port); } if (_unknownFields != null) { @@ -1090,9 +1066,6 @@ namespace AxibugProtobuf { if (TunnelID != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TunnelID); } - if (IP.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(IP); - } if (Port != 0) { size += 1 + pb::CodedOutputStream.ComputeInt32Size(Port); } @@ -1110,9 +1083,6 @@ namespace AxibugProtobuf { if (other.TunnelID != 0) { TunnelID = other.TunnelID; } - if (other.IP.Length != 0) { - IP = other.IP; - } if (other.Port != 0) { Port = other.Port; } @@ -1134,11 +1104,7 @@ namespace AxibugProtobuf { TunnelID = input.ReadUInt32(); break; } - case 18: { - IP = input.ReadString(); - break; - } - case 24: { + case 16: { Port = input.ReadInt32(); break; } @@ -1160,11 +1126,7 @@ namespace AxibugProtobuf { TunnelID = input.ReadUInt32(); break; } - case 18: { - IP = input.ReadString(); - break; - } - case 24: { + case 16: { Port = input.ReadInt32(); break; } @@ -1854,6 +1816,7 @@ namespace AxibugProtobuf { public Protobuf_S2C_Connect(Protobuf_S2C_Connect other) : this() { tunnelID_ = other.tunnelID_; idx_ = other.idx_; + connected_ = other.connected_; _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); } @@ -1890,6 +1853,20 @@ namespace AxibugProtobuf { } } + /// Field number for the "Connected" field. + public const int ConnectedFieldNumber = 3; + private uint connected_; + /// + ///[0]连接失败 [1]连接成功 + /// + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint Connected { + get { return connected_; } + set { + connected_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as Protobuf_S2C_Connect); @@ -1905,6 +1882,7 @@ namespace AxibugProtobuf { } if (TunnelID != other.TunnelID) return false; if (Idx != other.Idx) return false; + if (Connected != other.Connected) return false; return Equals(_unknownFields, other._unknownFields); } @@ -1913,6 +1891,7 @@ namespace AxibugProtobuf { int hash = 1; if (TunnelID != 0) hash ^= TunnelID.GetHashCode(); if (Idx != 0) hash ^= Idx.GetHashCode(); + if (Connected != 0) hash ^= Connected.GetHashCode(); if (_unknownFields != null) { hash ^= _unknownFields.GetHashCode(); } @@ -1937,6 +1916,10 @@ namespace AxibugProtobuf { output.WriteRawTag(16); output.WriteUInt32(Idx); } + if (Connected != 0) { + output.WriteRawTag(24); + output.WriteUInt32(Connected); + } if (_unknownFields != null) { _unknownFields.WriteTo(output); } @@ -1954,6 +1937,10 @@ namespace AxibugProtobuf { output.WriteRawTag(16); output.WriteUInt32(Idx); } + if (Connected != 0) { + output.WriteRawTag(24); + output.WriteUInt32(Connected); + } if (_unknownFields != null) { _unknownFields.WriteTo(ref output); } @@ -1969,6 +1956,9 @@ namespace AxibugProtobuf { if (Idx != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Idx); } + if (Connected != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Connected); + } if (_unknownFields != null) { size += _unknownFields.CalculateSize(); } @@ -1986,6 +1976,9 @@ namespace AxibugProtobuf { if (other.Idx != 0) { Idx = other.Idx; } + if (other.Connected != 0) { + Connected = other.Connected; + } _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); } @@ -2008,6 +2001,10 @@ namespace AxibugProtobuf { Idx = input.ReadUInt32(); break; } + case 24: { + Connected = input.ReadUInt32(); + break; + } } } #endif @@ -2030,6 +2027,10 @@ namespace AxibugProtobuf { Idx = input.ReadUInt32(); break; } + case 24: { + Connected = input.ReadUInt32(); + break; + } } } } diff --git a/ProtobufCore/proto/protobuf_NoSugar.proto b/ProtobufCore/proto/protobuf_NoSugar.proto index cdc651d..c3f578f 100644 --- a/ProtobufCore/proto/protobuf_NoSugar.proto +++ b/ProtobufCore/proto/protobuf_NoSugar.proto @@ -78,8 +78,7 @@ message Protobuf_Cfgs message Protobuf_Cfgs_Single { uint32 TunnelID = 1;//TunnelID - string IP = 2;//IP - int32 Port = 3;//端口 + int32 Port = 2;//端口 } //聊天 上行 @@ -107,6 +106,7 @@ message Protobuf_S2C_Connect { uint32 TunnelID = 1;//TunnelID uint32 Idx = 2;//单个隧道连接下标 + uint32 Connected = 3;//[0]连接失败 [1]连接成功 } message Protobuf_C2S_Disconnect diff --git a/Sample/NoSugarNet.ClientCli/Program.cs b/Sample/NoSugarNet.ClientCli/Program.cs index f09c7b0..35b52b7 100644 --- a/Sample/NoSugarNet.ClientCli/Program.cs +++ b/Sample/NoSugarNet.ClientCli/Program.cs @@ -7,6 +7,10 @@ namespace NoSugarNet.ClientCli static void Main(string[] args) { AppNoSugarNet.Init("127.0.0.1", 1000); + while (true) + { + Console.ReadLine(); + } } } } \ No newline at end of file diff --git a/Sample/NoSugarNet.ServerCli/Config.cs b/Sample/NoSugarNet.ServerCli/Config.cs new file mode 100644 index 0000000..eb8c776 --- /dev/null +++ b/Sample/NoSugarNet.ServerCli/Config.cs @@ -0,0 +1,48 @@ +using NoSugarNet.ServerCore.Common; +using System.Text; + +namespace NoSugarNet.ServerCli +{ + public static class Config + { + public static Dictionary Cfgs = new Dictionary(); + public static bool LoadConfig() + { + try + { + StreamReader sr = new StreamReader(System.Environment.CurrentDirectory + "//config.cfg", Encoding.Default); + String line; + while (!string.IsNullOrEmpty((line = sr.ReadLine()))) + { + if (!line.Contains(":")) + continue; + try + { + TunnelClientData cfg = new TunnelClientData() + { + TunnelId = Convert.ToByte(line.Split(':')[0].Trim()), + ServerLocalIP = line.Split(':')[1].Trim(), + ServerLocalPort = Convert.ToUInt16(line.Split(':')[2].Trim()), + ClientLocalPort = Convert.ToUInt16(line.Split(':')[3].Trim()) + }; + Cfgs[cfg.TunnelId] = cfg; + } + catch + { + continue; + } + } + sr.Close(); + if (Cfgs.Count > 0) + return true; + else + return false; + } + catch (Exception ex) + { + Console.WriteLine("配置文件异常：" + ex.ToString()); + return false; + } + } + } +} diff --git a/Sample/NoSugarNet.ServerCli/NoSugarNet.ServerCli.csproj b/Sample/NoSugarNet.ServerCli/NoSugarNet.ServerCli.csproj index 3a33c16..75d10bb 100644 --- a/Sample/NoSugarNet.ServerCli/NoSugarNet.ServerCli.csproj +++ b/Sample/NoSugarNet.ServerCli/NoSugarNet.ServerCli.csproj @@ -7,6 +7,14 @@ enable + + + + + + + + diff --git a/Sample/NoSugarNet.ServerCli/Program.cs b/Sample/NoSugarNet.ServerCli/Program.cs index 108b4bb..76d02a8 100644 --- a/Sample/NoSugarNet.ServerCli/Program.cs +++ b/Sample/NoSugarNet.ServerCli/Program.cs @@ -6,7 +6,14 @@ namespace NoSugarNet.ServerCli { static void Main(string[] args) { - ServerManager.InitServer(1000); + if (!Config.LoadConfig()) + { + Console.WriteLine("配置文件错误"); + Console.ReadLine(); + return; + } + + ServerManager.InitServer(1000,Config.Cfgs); while (true) { Console.ReadLine(); diff --git a/Sample/NoSugarNet.ServerCli/config.cfg b/Sample/NoSugarNet.ServerCli/config.cfg new file mode 100644 index 0000000..96e433c --- /dev/null +++ b/Sample/NoSugarNet.ServerCli/config.cfg @@ -0,0 +1,4 @@ +0:127.0.0.1:3306:10001 +1:127.0.0.1:3306:10002 +2:127.0.0.1:3306:10003 +3:127.0.0.1:3306:10004 \ No newline at end of file