edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8332 from heinrich5991/pr_ddnet_fix_token_7

Browse source 
Fix 0.7 tokens after #8322
This commit is contained in:
heinrich5991 2024-05-08 13:12:32 +00:00 committed by GitHub
parent f214c1101b c211e874aa
commit 3887eea18d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/engine/shared/network_server.cpp
View file

@ -540,7 +540,7 @@ int CNetServer::OnSixupCtrlMsg(NETADDR &Addr, CNetChunk *pChunk, int ControlMsg,
if(m_RecvUnpacker.m_Data.m_DataSize < 5 || ClientExists(Addr))
return 0; // silently ignore
mem_copy(&ResponseToken, Packet.m_aChunkData + 1, 4);
ResponseToken = ToSecurityToken(Packet.m_aChunkData + 1);
if(ControlMsg == 5)
{
@ -758,7 +758,7 @@ void CNetServer::SendTokenSixup(NETADDR &Addr, SECURITY_TOKEN Token)
{
SECURITY_TOKEN MyToken = GetToken(Addr);
unsigned char aBuf[512] = {};
mem_copy(aBuf, &MyToken, 4);
WriteSecurityToken(aBuf, MyToken);
int Size = (Token == NET_SECURITY_TOKEN_UNKNOWN) ? 512 : 4;
CNetBase::SendControlMsg(m_Socket, &Addr, 0, 5, aBuf, Size, Token, true);
}
@ -771,8 +771,8 @@ int CNetServer::SendConnlessSixup(CNetChunk *pChunk, SECURITY_TOKEN ResponseToke
unsigned char aBuffer[NET_MAX_PACKETSIZE];
aBuffer[0] = NET_PACKETFLAG_CONNLESS << 2 | 1;
SECURITY_TOKEN Token = GetToken(pChunk->m_Address);
mem_copy(aBuffer + 1, &ResponseToken, 4);
mem_copy(aBuffer + 5, &Token, 4);
WriteSecurityToken(aBuffer + 1, ResponseToken);
WriteSecurityToken(aBuffer + 5, Token);
mem_copy(aBuffer + 9, pChunk->m_pData, pChunk->m_DataSize);
net_udp_send(m_Socket, &pChunk->m_Address, aBuffer, pChunk->m_DataSize + 9);