BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2026-06-18 22:50:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add endian-correctness to TCPSend&Rcv

Browse Source
This commit is contained in:
Lion Kortlepel
2020-11-08 11:46:02 +01:00
parent a2b6b29ea1
commit 88ed494ddd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Network/VehicleEvent.cpp
+5 -2
View File
@@ -29,10 +29,12 @@ void TCPSend(const std::string&Data){
Terminate = true; Terminate = true;
return; return;
} }
auto Size = int32_t(Data.size()); // Size is BIG-ENDIAN!
auto Size = htonl(int32_t(Data.size()));
std::string Send(4,0); std::string Send(4,0);
memcpy(&Send[0],&Size,sizeof(Size)); memcpy(&Send[0],&Size,sizeof(Size));
Send += Data; Send += Data;
// Do not use Size before this point for anything but the header
Size = int32_t(Send.size()); Size = int32_t(Send.size());
int32_t Sent = 0,Temp; int32_t Sent = 0,Temp;
do{ do{
@@ -50,7 +52,8 @@ void TCPRcv(){
} }
static int32_t Header,BytesRcv,Temp; static int32_t Header,BytesRcv,Temp;
BytesRcv = recv(TCPSock, reinterpret_cast<char*>(&Header), sizeof(Header),0); BytesRcv = recv(TCPSock, reinterpret_cast<char*>(&Header), sizeof(Header),0);
// convert back to LITTLE ENDIAN
Header = ntohl(Header);
if(!CheckBytes(BytesRcv))return; if(!CheckBytes(BytesRcv))return;
char* Data = new char[Header]; char* Data = new char[Header];
BytesRcv = 0; BytesRcv = 0;