BeamMP/BeamMP-Launcher
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Launcher.git synced 2025-07-01 23:46:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Little Itsy Bitsy TCP fixes (#118)

Browse Source
This commit is contained in:
Lion 2024-09-23 21:46:11 +02:00 committed by GitHub
commit 4bedfc8e96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 53 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Network/GlobalHandler.cpp
View File

@ -6,6 +6,7 @@
/// Created by Anonymous275 on 7/25/2020
///
#include "Network/network.hpp"
#include <memory>
#include <zlib.h>
#if defined(_WIN32)
#include <winsock2.h>
@ -124,17 +125,17 @@ void NetReset() {
UlStatus = "Ulstart";
MStatus = " ";
if (UDPSock != (SOCKET)(-1)) {
debug("Terminating UDP Socket : " + std::to_string(TCPSock));
debug("Terminating UDP Socket: " + std::to_string(TCPSock));
KillSocket(UDPSock);
}
UDPSock = -1;
if (TCPSock != (SOCKET)(-1)) {
debug("Terminating TCP Socket : " + std::to_string(TCPSock));
debug("Terminating TCP Socket: " + std::to_string(TCPSock));
KillSocket(TCPSock);
}
TCPSock = -1;
if (GSocket != (SOCKET)(-1)) {
debug("Terminating GTCP Socket : " + std::to_string(GSocket));
debug("Terminating GTCP Socket: " + std::to_string(GSocket));
KillSocket(GSocket);
}
GSocket = -1;
@ -234,6 +235,8 @@ void NetMain(const std::string& IP, int Port) {
}
void TCPGameServer(const std::string& IP, int Port) {
GSocket = SetupListener();
std::unique_ptr<std::thread> ClientThread {};
std::unique_ptr<std::thread> NetMainThread {};
while (!TCPTerminate && GSocket != -1) {
debug("MAIN LOOP OF GAME SERVER");
GConnected = false;
@ -245,8 +248,7 @@ void TCPGameServer(const std::string& IP, int Port) {
break;
}
if (CServer) {
std::thread Client(TCPClientMain, IP, Port);
Client.detach();
ClientThread = std::make_unique<std::thread>(TCPClientMain, IP, Port);
}
CSocket = accept(GSocket, nullptr, nullptr);
if (CSocket == -1) {
@ -256,8 +258,7 @@ void TCPGameServer(const std::string& IP, int Port) {
debug("(Proxy) Game Connected!");
GConnected = true;
if (CServer) {
std::thread t1(NetMain, IP, Port);
t1.detach();
NetMainThread = std::make_unique<std::thread>(NetMain, IP, Port);
CServer = false;
}
int32_t Size, Temp, Rcv;
@ -300,6 +301,16 @@ void TCPGameServer(const std::string& IP, int Port) {
TCPTerminate = true;
GConnected = false;
Terminate = true;
if (ClientThread) {
debug("Waiting for client thread");
ClientThread->join();
debug("Client thread done");
}
if (NetMainThread) {
debug("Waiting for net main thread");
NetMainThread->join();
debug("Net main thread done");
}
if (CSocket != SOCKET_ERROR)
KillSocket(CSocket);
debug("END OF GAME SERVER");

10
src/Network/VehicleData.cpp
View File

@ -7,6 +7,7 @@
///
#include "Network/network.hpp"
#include "Zlib/Compressor.h"
#include <stdexcept>
#if defined(_WIN32)
#include <ws2tcpip.h>
@ -50,9 +51,13 @@ void SendLarge(std::string Data) {
void UDPParser(std::string_view Packet) {
if (Packet.substr(0, 4) == "ABG:") {
auto substr = Packet.substr(4);
try {
auto res = DeComp(std::span<const char>(substr.data(), substr.size()));
std::string DeCompPacket = std::string(res.data(), res.size());
ServerParser(DeCompPacket);
} catch (const std::runtime_error& err) {
error("Error in decompression of UDP, ignoring");
}
} else {
ServerParser(Packet);
}
@ -92,8 +97,11 @@ void UDPClientMain(const std::string& IP, int Port) {
GameSend("P" + std::to_string(ClientID));
TCPSend("H", TCPSock);
UDPSend("p");
while (!Terminate)
debug("Starting UDP receive loop");
while (!Terminate) {
UDPRcv();
}
debug("UDP receive loop done");
KillSocket(UDPSock);
WSACleanup();
}

26
src/Network/VehicleEvent.cpp
View File

@ -82,39 +82,39 @@ std::string TCPRcv(SOCKET Sock) {
UUl("Invalid Socket");
return "";
}
int32_t Header, BytesRcv = 0, Temp;
int32_t Header, Temp;
std::vector<char> Data(sizeof(Header));
do {
Temp = recv(Sock, &Data[BytesRcv], 4 - BytesRcv, 0);
Temp = recv(Sock, Data.data(), sizeof(Header), MSG_WAITALL);
if (!CheckBytes(Temp)) {
UUl("Socket Closed Code 3");
return "";
}
BytesRcv += Temp;
} while (BytesRcv < 4);
memcpy(&Header, &Data[0], sizeof(Header));
memcpy(&Header, Data.data(), sizeof(Header));
if (!CheckBytes(BytesRcv)) {
if (!CheckBytes(Temp)) {
UUl("Socket Closed Code 4");
return "";
}
Data.resize(Header);
BytesRcv = 0;
do {
Temp = recv(Sock, &Data[BytesRcv], Header - BytesRcv, 0);
Data.resize(Header, 0);
Temp = recv(Sock, Data.data(), Header, MSG_WAITALL);
if (!CheckBytes(Temp)) {
UUl("Socket Closed Code 5");
return "";
}
BytesRcv += Temp;
} while (BytesRcv < Header);
std::string Ret(Data.data(), Header);
if (Ret.substr(0, 4) == "ABG:") {
auto substr = Ret.substr(4);
try {
auto res = DeComp(std::span<char>(substr.data(), substr.size()));
Ret = std::string(res.data(), res.size());
} catch (const std::runtime_error& err) {
// this happens e.g. when we're out of memory, or when we get incomplete data
error("Decompression failed");
return "";
}
}
#ifdef DEBUG