This commit is contained in:
azw 2023-04-25 02:28:15 +00:00
parent 15f49da6c1
commit 8fb293e9e4
3 changed files with 2 additions and 7 deletions

View File

@ -18,6 +18,7 @@ public:
const sockaddr_in& GetAddr() const { return remote_addr_; } const sockaddr_in& GetAddr() const { return remote_addr_; }
int GetSocketHandle() { return socket_handle_; } int GetSocketHandle() { return socket_handle_; }
long long GetSecretKey() { return secret_key_; } long long GetSecretKey() { return secret_key_; }
void* GetSecretKeyDataPtr() { return &secret_key_; }
void SendClientMsg(char* buf, int buf_len); void SendClientMsg(char* buf, int buf_len);
virtual void OnRecvPacket(a8::UdpPacket* pkt) override; virtual void OnRecvPacket(a8::UdpPacket* pkt) override;

View File

@ -5,9 +5,6 @@
#include "longsession.h" #include "longsession.h"
#include "kcpsession.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) void LongSession::Init(f8::MsgHdr& hdr, const ss::SS_CMKcpHandshake& msg)
{ {
kcp_session_ = std::make_shared<KcpSession>(); kcp_session_ = std::make_shared<KcpSession>();

View File

@ -64,10 +64,7 @@ void LongSessionMgr::_SS_CMKcpHandshake(f8::MsgHdr& hdr, const ss::SS_CMKcpHands
socket_handle_hash_[session->GetKcpSession()->GetSocketHandle()] = session; socket_handle_hash_[session->GetKcpSession()->GetSocketHandle()] = session;
respmsg.set_conv(session->GetKcpSession()->GetSocketHandle()); respmsg.set_conv(session->GetKcpSession()->GetSocketHandle());
{ respmsg.set_secret_key(session->GetKcpSession()->GetSecretKeyDataPtr(), KcpSession::GetSecretKeyLen());
long long secret_key = session->GetKcpSession()->GetSecretKey();
respmsg.set_secret_key(&secret_key, sizeof(secret_key));
}
respmsg.set_remote_host(JsonDataMgr::Instance()->GetUdpHost()); respmsg.set_remote_host(JsonDataMgr::Instance()->GetUdpHost());
respmsg.set_remote_port(JsonDataMgr::Instance()->GetUdpPort()); respmsg.set_remote_port(JsonDataMgr::Instance()->GetUdpPort());
GCListener::Instance()->SendMsgEx(hdr.socket_handle, ss::_SS_CMKcpHandshake, respmsg); GCListener::Instance()->SendMsgEx(hdr.socket_handle, ss::_SS_CMKcpHandshake, respmsg);