BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-08-17 16:57:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed launcher not terminating on socket error

Browse Source
This commit is contained in:
Anonymous275 2022-03-06 01:24:24 +02:00
parent 158eb26456
commit 0a5343cbd9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Network/Server.cpp
View File

@ -253,11 +253,13 @@ void Server::TCPSend(const std::string& Data) {
if (size_t(Sent) >= Send.size()) { if (size_t(Sent) >= Send.size()) {
LOG(ERROR) << "string OOB in " << std::string(__func__); LOG(ERROR) << "string OOB in " << std::string(__func__);
UUl("TCP Send OOB"); UUl("TCP Send OOB");
Terminate = true;
return; return;
} }
Temp = send(TCPSocket, &Send[Sent], Size - Sent, 0); Temp = send(TCPSocket, &Send[Sent], Size - Sent, 0);
if(!CheckBytes(Temp)){ if(!CheckBytes(Temp)){
UUl("Socket Closed Code 2"); UUl("Socket Closed Code 2");
Terminate = true;
return; return;
} }
Sent += Temp; Sent += Temp;
@ -276,6 +278,7 @@ std::string Server::TCPRcv() {
Temp = recv(TCPSocket, &Data[BytesRcv], 4-BytesRcv, 0); Temp = recv(TCPSocket, &Data[BytesRcv], 4-BytesRcv, 0);
if(!CheckBytes(Temp)){ if(!CheckBytes(Temp)){
UUl("Socket Closed Code 3"); UUl("Socket Closed Code 3");
Terminate = true;
return ""; return "";
} }
BytesRcv += Temp; BytesRcv += Temp;
@ -284,6 +287,7 @@ std::string Server::TCPRcv() {
if(!CheckBytes(BytesRcv)){ if(!CheckBytes(BytesRcv)){
UUl("Socket Closed Code 4"); UUl("Socket Closed Code 4");
Terminate = true;
return ""; return "";
} }
Data.resize(Header); Data.resize(Header);
@ -292,6 +296,7 @@ std::string Server::TCPRcv() {
Temp = recv(TCPSocket, &Data[BytesRcv], Header-BytesRcv, 0); Temp = recv(TCPSocket, &Data[BytesRcv], Header-BytesRcv, 0);
if(!CheckBytes(Temp)){ if(!CheckBytes(Temp)){
UUl("Socket Closed Code 5"); UUl("Socket Closed Code 5");
Terminate = true;
return ""; return "";
} }
BytesRcv += Temp; BytesRcv += Temp;