R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Engine: fix bug regarding packet compression override

Browse Source 
Only encrypt and decrypt packets if the initial argument tells it to do so. Some connectionless packets aren't supposed to be encrypted
This commit is contained in:
Kawe Mazidjatari 2024-02-19 21:18:45 +01:00
parent d467989e7c
commit a26821759e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
r5dev/engine/net.cpp
View File

@ -27,13 +27,16 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
bool NET_ReceiveDatagram(int iSocket, netpacket_s* pInpacket, bool bEncrypted) bool NET_ReceiveDatagram(int iSocket, netpacket_s* pInpacket, bool bEncrypted)
{ {
bool result = v_NET_ReceiveDatagram(iSocket, pInpacket, net_encryptionEnable->GetBool()); const bool decryptPacket = (bEncrypted && net_encryptionEnable->GetBool());
const bool result = v_NET_ReceiveDatagram(iSocket, pInpacket, decryptPacket);
if (result && net_tracePayload->GetBool()) if (result && net_tracePayload->GetBool())
{ {
// Log received packet data. // Log received packet data.
HexDump("[+] NET_ReceiveDatagram ", "net_trace", HexDump("[+] NET_ReceiveDatagram ", "net_trace",
pInpacket->pData, size_t(pInpacket->wiresize)); pInpacket->pData, size_t(pInpacket->wiresize));
} }
return result; return result;
} }
@ -48,12 +51,15 @@ bool NET_ReceiveDatagram(int iSocket, netpacket_s* pInpacket, bool bEncrypted)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
int NET_SendDatagram(SOCKET s, void* pPayload, int iLenght, netadr_t* pAdr, bool bEncrypt) int NET_SendDatagram(SOCKET s, void* pPayload, int iLenght, netadr_t* pAdr, bool bEncrypt)
{ {
int result = v_NET_SendDatagram(s, pPayload, iLenght, pAdr, net_encryptionEnable->GetBool()); const bool encryptPacket = (bEncrypt && net_encryptionEnable->GetBool());
const int result = v_NET_SendDatagram(s, pPayload, iLenght, pAdr, encryptPacket);
if (result && net_tracePayload->GetBool()) if (result && net_tracePayload->GetBool())
{ {
// Log transmitted packet data. // Log transmitted packet data.
HexDump("[+] NET_SendDatagram ", "net_trace", pPayload, size_t(iLenght)); HexDump("[+] NET_SendDatagram ", "net_trace", pPayload, size_t(iLenght));
} }
return result; return result;
} }