server_common/wsproxy
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
azw 2023-06-09 06:57:46 +00:00
parent 571a29eebb
commit 7eb242f5b8
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/wsproxy/kcpsession.cc
View File

@ -1,6 +1,7 @@
#include "precompile.h" #include "precompile.h"
#include <memory.h> #include <memory.h>
#include <string.h>
#include <f8/netmsghandler.h> #include <f8/netmsghandler.h>
#include <f8/udplog.h> #include <f8/udplog.h>
@ -74,8 +75,21 @@ void KcpSession::SendClientMsg(char* buf, int buf_len)
void KcpSession::OnRecvPacket(a8::UdpPacket* pkt) void KcpSession::OnRecvPacket(a8::UdpPacket* pkt)
{ {
const int IKCP_OVERHEAD = 24;
remote_addr_ = pkt->remote_addr; remote_addr_ = pkt->remote_addr;
if (GetSecretKeyPlace()) {
char* buf = (char*)malloc(pkt->buf_len - GetSecretKeyLen());
int buflen = pkt->buf_len - GetSecretKeyLen();
memmove(buf, pkt->buf, IKCP_OVERHEAD);
if (pkt->buf_len > IKCP_OVERHEAD + GetSecretKeyLen()) {
memmove(buf + IKCP_OVERHEAD, pkt->buf + IKCP_OVERHEAD + GetSecretKeyLen(), buflen - IKCP_OVERHEAD);
}
ikcp_input(kcp_, buf, buflen);
free(buf);
} else {
ikcp_input(kcp_, pkt->buf, pkt->buf_len); ikcp_input(kcp_, pkt->buf, pkt->buf_len);
}
} }
void KcpSession::UpdateInput() void KcpSession::UpdateInput()

2
server/wsproxy/longsessionmgr.cc
View File

@ -134,7 +134,7 @@ void LongSessionMgr::ProcUdpPacket(a8::UdpPacket* pkt)
return; return;
} }
if (session->GetSecretKeyPlace()) { if (session->GetSecretKeyPlace()) {
if (pkt->buf_len > IKCP_OVERHEAD + KcpSession::GetSecretKeyLen()) { if (pkt->buf_len >= IKCP_OVERHEAD + KcpSession::GetSecretKeyLen()) {
long long secret_key = KcpSession::ReadSecretKey(pkt->buf + IKCP_OVERHEAD, pkt->buf_len); long long secret_key = KcpSession::ReadSecretKey(pkt->buf + IKCP_OVERHEAD, pkt->buf_len);
if (secret_key == session->GetKcpSession()->GetSecretKey()) { if (secret_key == session->GetKcpSession()->GetSecretKey()) {
session->GetKcpSession()->OnRecvPacket(pkt); session->GetKcpSession()->OnRecvPacket(pkt);