Compare commits

..

5 Commits

Author SHA1 Message Date
Tixx 92381aa048 handle incomplete MSG_WAITALL during tcp receive (#248)
Addresses https://github.com/BeamMP/BeamMP-Launcher/issues/185 by
handling incomplete TCP recv despite MSG_WAITALL

Fixes running the launcher inside of wine as well as the rare instances
where this happens natively.

```
       MSG_WAITALL (since Linux 2.2)
              This flag requests that the operation block until the full request is satisfied.
              However, the call may still return less data than requested if a signal is caught,
              an error or disconnect occurs, or the next data to  be  re‐ceived is of a different type
              than that returned.  This flag has no effect for datagram sockets.

```

---

By creating this pull request, I understand that code that is AI
generated or otherwise automatically generated may be rejected without
further discussion.
I declare that I fully understand all code I pushed into this PR, and
wrote all this code myself and own the rights to this code.
2026-06-13 22:16:20 +02:00
Katharine Chui 30639abb88 enforce expected recv size during event and server info tcp recv, remove unused instance of CheckBytes function 2026-05-11 12:47:44 +02:00
Katharine Chui 23760da53b do not discard received data during RecvWaitAll when the other side closes the socket cleanly 2026-04-30 20:35:51 +02:00
Katharine Chui 809080c9aa use RecvWaitAll outside of VehicleEvent.cpp as well 2026-04-30 19:58:05 +02:00
Katharine Chui f1ec753ca3 handle incomplete MSG_WAITALL during tcp receive 2026-04-28 12:43:33 +02:00
6 changed files with 42 additions and 60 deletions
+2 -1
View File
@@ -42,7 +42,7 @@ extern std::string magic;
int KillSocket(uint64_t Dead); int KillSocket(uint64_t Dead);
void UUl(const std::string& R); void UUl(const std::string& R);
void UDPSend(std::string Data); void UDPSend(std::string Data);
bool CheckBytes(int32_t Bytes); bool CheckBytes(int32_t Bytes, int32_t Expected = -1);
void GameSend(std::string_view Data); void GameSend(std::string_view Data);
void SendLarge(std::string Data); void SendLarge(std::string Data);
std::string TCPRcv(uint64_t Sock); std::string TCPRcv(uint64_t Sock);
@@ -56,3 +56,4 @@ void UDPClientMain(const std::string& IP, int Port);
void TCPGameServer(const std::string& IP, int Port); void TCPGameServer(const std::string& IP, int Port);
bool SecurityWarning(); bool SecurityWarning();
void CoreSend(std::string data); void CoreSend(std::string data);
int RecvWaitAll(int sockfd, char *buf, int len);
+8 -9
View File
@@ -143,29 +143,28 @@ void GetServerInfo(std::string Data) {
const std::string buffer = ([&]() -> std::string { const std::string buffer = ([&]() -> std::string {
int32_t Header; int32_t Header;
std::vector<char> data(sizeof(Header)); std::vector<char> data(sizeof(Header));
int Temp = recv(ISock, data.data(), sizeof(Header), MSG_WAITALL); int Temp = RecvWaitAll(ISock, data.data(), sizeof(Header));
auto checkBytes = ([&](const int32_t bytes) -> bool { auto checkBytes = ([&](const int32_t bytes, const int32_t expected = -1) -> bool {
if (bytes == 0) { if (bytes == 0) {
return false; return false;
} else if (bytes < 0) { } else if (bytes < 0) {
return false; return false;
} }
if (expected != -1 && bytes != expected) {
return false;
}
return true; return true;
}); });
if (!checkBytes(Temp)) { if (!checkBytes(Temp, sizeof(Header))) {
return ""; return "";
} }
memcpy(&Header, data.data(), sizeof(Header)); memcpy(&Header, data.data(), sizeof(Header));
if (!checkBytes(Temp)) {
return "";
}
data.resize(Header, 0); data.resize(Header, 0);
Temp = recv(ISock, data.data(), Header, MSG_WAITALL); Temp = RecvWaitAll(ISock, data.data(), Header);
if (!checkBytes(Temp)) { if (!checkBytes(Temp, Header)) {
return ""; return "";
} }
return std::string(data.data(), Header); return std::string(data.data(), Header);
-11
View File
@@ -50,17 +50,6 @@ int KillSocket(uint64_t Dead) {
return a; return a;
} }
bool CheckBytes(uint32_t Bytes) {
if (Bytes == 0) {
debug("(Proxy) Connection closing");
return false;
} else if (Bytes < 0) {
debug("(Proxy) send failed with error: " + std::to_string(WSAGetLastError()));
return false;
}
return true;
}
void GameSend(std::string_view Data) { void GameSend(std::string_view Data) {
static std::mutex Lock; static std::mutex Lock;
std::scoped_lock Guard(Lock); std::scoped_lock Guard(Lock);
+1 -1
View File
@@ -164,7 +164,7 @@ std::vector<char> TCPRcvRaw(SOCKET Sock, uint64_t& GRcv, uint64_t Size) {
do { do {
// receive at most some MB at a time // receive at most some MB at a time
int Len = std::min(int(Size - Rcv), 1 * 1024 * 1024); int Len = std::min(int(Size - Rcv), 1 * 1024 * 1024);
int Temp = recv(Sock, &File[Rcv], Len, MSG_WAITALL); int Temp = RecvWaitAll(Sock, &File[Rcv], Len);
if (Temp == -1 || Temp == 0) { if (Temp == -1 || Temp == 0) {
debug("Recv returned: " + std::to_string(Temp)); debug("Recv returned: " + std::to_string(Temp));
if (Temp == -1) { if (Temp == -1) {
+29 -6
View File
@@ -28,9 +28,9 @@ int LastPort;
std::string LastIP; std::string LastIP;
SOCKET TCPSock = -1; SOCKET TCPSock = -1;
bool CheckBytes(int32_t Bytes) { bool CheckBytes(int32_t Bytes, int32_t Expected) {
if (Bytes == 0) { if (Bytes == 0) {
debug("(TCP) Connection closing... CheckBytes(16)"); debug("(TCP) Connection closing...");
Terminate = true; Terminate = true;
return false; return false;
} else if (Bytes < 0) { } else if (Bytes < 0) {
@@ -39,6 +39,11 @@ bool CheckBytes(int32_t Bytes) {
Terminate = true; Terminate = true;
return false; return false;
} }
if (Expected != -1 && Bytes != Expected) {
debug(std::format("(TCP) Short recv detected, expected {} bytes, got {} bytes", Expected, Bytes));
Terminate = true;
return false;
}
return true; return true;
} }
void UUl(const std::string& R) { void UUl(const std::string& R) {
@@ -75,6 +80,24 @@ void TCPSend(const std::string& Data, uint64_t Sock) {
} while (Sent < Size); } while (Sent < Size);
} }
int RecvWaitAll(int sockfd, char *buf, int len) {
// handle MSG_WAITALL not actually filling the whole buffer
// happens frequently in wine, and can also happen natively when the OS pauses the execution for various reasons
int offset = 0;
while (offset < len) {
int recv_status = recv(sockfd, &buf[offset], len - offset, MSG_WAITALL);
if (recv_status == 0) {
// do not discard received data when the other side closes the socket cleanly
return offset;
}
if (recv_status == -1) {
return -1;
}
offset += recv_status;
}
return offset;
}
std::string TCPRcv(SOCKET Sock) { std::string TCPRcv(SOCKET Sock) {
if (Sock == -1) { if (Sock == -1) {
Terminate = true; Terminate = true;
@@ -84,8 +107,8 @@ std::string TCPRcv(SOCKET Sock) {
int32_t Header; int32_t Header;
int Temp; int Temp;
std::vector<char> Data(sizeof(Header)); std::vector<char> Data(sizeof(Header));
Temp = recv(Sock, Data.data(), sizeof(Header), MSG_WAITALL); Temp = RecvWaitAll(Sock, Data.data(), sizeof(Header));
if (!CheckBytes(Temp)) { if (!CheckBytes(Temp, sizeof(Header))) {
UUl("Socket Closed Code 3"); UUl("Socket Closed Code 3");
return ""; return "";
} }
@@ -97,8 +120,8 @@ std::string TCPRcv(SOCKET Sock) {
} }
Data.resize(Header, 0); Data.resize(Header, 0);
Temp = recv(Sock, Data.data(), Header, MSG_WAITALL); Temp = RecvWaitAll(Sock, Data.data(), Header);
if (!CheckBytes(Temp)) { if (!CheckBytes(Temp, Header)) {
UUl("Socket Closed Code 5"); UUl("Socket Closed Code 5");
return ""; return "";
} }
+2 -32
View File
@@ -4,6 +4,7 @@
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
*/ */
#include <filesystem> #include <filesystem>
#include "Utils.h" #include "Utils.h"
#if defined(_WIN32) #if defined(_WIN32)
@@ -256,38 +257,7 @@ void LegitimacyCheck() {
} }
if (!steamappsFolderFound) { if (!steamappsFolderFound) {
warn("Unsupported Steam installation."); error("Unsupported Steam installation.");
auto userfolderIniPath = homeDir / "/.local/share/BeamNG/BeamNG.drive.ini";
if (std::filesystem::exists(userfolderIniPath)) {
if (std::ifstream beamngIni(userfolderIniPath); beamngIni.is_open()) {
std::string contents((std::istreambuf_iterator(beamngIni)), std::istreambuf_iterator<char>());
beamngIni.close();
if (contents.size() >= 3 && (unsigned char)contents[0] == 0xEF && (unsigned char)contents[1] == 0xBB && (unsigned char)contents[2] == 0xBF) {
contents = contents.substr(3);
}
auto ini = Utils::ParseINI(contents);
if (ini.empty())
lowExit(3);
else
debug("Successfully parsed BeamNG.Drive.ini");
if (ini.contains("installPath")) {
std::string installPath = std::get<std::string>(ini["installPath"]);
installPath.erase(0, installPath.find_first_not_of(" \t"));
if (installPath = std::filesystem::path(Utils::ExpandEnvVars(installPath)).string(); std::filesystem::exists(installPath)) {
GameDir = installPath;
debug("GameDir from BeamNG.Drive.ini: " + installPath);
} else {
lowExit(4);
}
} else {
lowExit(5);
}
}
}
return; return;
} }
if (!libraryFoldersFound) { if (!libraryFoldersFound) {