From 8fb293e9e4993b5f5412f6503e1c6c9d9ff10870 Mon Sep 17 00:00:00 2001 From: azw Date: Tue, 25 Apr 2023 02:28:15 +0000 Subject: [PATCH] 1 --- server/wsproxy/kcpsession.h | 1 + server/wsproxy/longsession.cc | 3 --- server/wsproxy/longsessionmgr.cc | 5 +---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/server/wsproxy/kcpsession.h b/server/wsproxy/kcpsession.h index 91104b6..db29158 100644 --- a/server/wsproxy/kcpsession.h +++ b/server/wsproxy/kcpsession.h @@ -18,6 +18,7 @@ public: const sockaddr_in& GetAddr() const { return remote_addr_; } int GetSocketHandle() { return socket_handle_; } long long GetSecretKey() { return secret_key_; } + void* GetSecretKeyDataPtr() { return &secret_key_; } void SendClientMsg(char* buf, int buf_len); virtual void OnRecvPacket(a8::UdpPacket* pkt) override; diff --git a/server/wsproxy/longsession.cc b/server/wsproxy/longsession.cc index 92ef03c..e261182 100644 --- a/server/wsproxy/longsession.cc +++ b/server/wsproxy/longsession.cc @@ -5,9 +5,6 @@ #include "longsession.h" #include "kcpsession.h" -#include "ss_msgid.pb.h" -#include "ss_proto.pb.h" - void LongSession::Init(f8::MsgHdr& hdr, const ss::SS_CMKcpHandshake& msg) { kcp_session_ = std::make_shared(); diff --git a/server/wsproxy/longsessionmgr.cc b/server/wsproxy/longsessionmgr.cc index e14417e..e26faee 100644 --- a/server/wsproxy/longsessionmgr.cc +++ b/server/wsproxy/longsessionmgr.cc @@ -64,10 +64,7 @@ void LongSessionMgr::_SS_CMKcpHandshake(f8::MsgHdr& hdr, const ss::SS_CMKcpHands socket_handle_hash_[session->GetKcpSession()->GetSocketHandle()] = session; respmsg.set_conv(session->GetKcpSession()->GetSocketHandle()); - { - long long secret_key = session->GetKcpSession()->GetSecretKey(); - respmsg.set_secret_key(&secret_key, sizeof(secret_key)); - } + respmsg.set_secret_key(session->GetKcpSession()->GetSecretKeyDataPtr(), KcpSession::GetSecretKeyLen()); respmsg.set_remote_host(JsonDataMgr::Instance()->GetUdpHost()); respmsg.set_remote_port(JsonDataMgr::Instance()->GetUdpPort()); GCListener::Instance()->SendMsgEx(hdr.socket_handle, ss::_SS_CMKcpHandshake, respmsg);