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

Implement size header for info packet

Browse Source
This commit is contained in:
Tixx 2025-01-12 16:57:33 +01:00
parent a5d450b680
commit 8d4ba6f158
No known key found for this signature in database
GPG Key ID: EC6E7A2BAABF0B8C
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Network/Core.cpp
View File

@ -90,7 +90,7 @@ void StartSync(const std::string& Data) {
} }
void GetServerInfo(std::string Data) { void GetServerInfo(std::string Data) {
debug("Fetching server info of " + Data.substr(1)); debug("Fetching server info of " + Data.substr(1));
std::string IP = GetAddr(Data.substr(1, Data.find(':') - 1)); std::string IP = GetAddr(Data.substr(1, Data.find(':') - 1));
if (IP.find('.') == -1) { if (IP.find('.') == -1) {
@ -129,6 +129,7 @@ void GetServerInfo(std::string Data) {
CoreSend("I" + Data + ";"); CoreSend("I" + Data + ";");
return; return;
} }
char Code[1] = { 'I' }; char Code[1] = { 'I' };
if (send(ISock, Code, 1, 0) != 1) { if (send(ISock, Code, 1, 0) != 1) {
debug("Sending data to server failed with error: " + std::to_string(WSAGetLastError())); debug("Sending data to server failed with error: " + std::to_string(WSAGetLastError()));
@ -137,13 +138,38 @@ void GetServerInfo(std::string Data) {
return; return;
} }
std::string buffer; const std::string buffer = ([&]() -> std::string {
buffer.resize(8192); int32_t Header;
std::vector<char> data(sizeof(Header));
int bytesReceived = recv(ISock, &buffer[0], buffer.size() - 1, 0); int32_t Temp = recv(ISock, data.data(), sizeof(Header), MSG_WAITALL);
if (bytesReceived > 0) { auto checkBytes = ([&](const int32_t bytes) -> bool {
buffer.resize(bytesReceived); if (bytes == 0) {
return false;
} else if (bytes < 0) {
return false;
}
return true;
});
if (!checkBytes(Temp)) {
return "";
}
memcpy(&Header, data.data(), sizeof(Header));
if (!checkBytes(Temp)) {
return "";
}
data.resize(Header, 0);
Temp = recv(ISock, data.data(), Header, MSG_WAITALL);
if (!checkBytes(Temp)) {
return "";
}
return std::string(data.data(), Header);
})();
if (!buffer.empty()) {
debug("Server Info: " + buffer); debug("Server Info: " + buffer);
CoreSend("I" + Data + ";" + buffer); CoreSend("I" + Data + ";" + buffer);