Compare commits

..

6 Commits

Author SHA1 Message Date
SaltySnail 55efae0658 Add region tld 2026-06-23 02:38:02 +02:00
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
13 changed files with 85 additions and 74 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);
+1
View File
@@ -20,6 +20,7 @@ struct Options {
bool no_update = false; bool no_update = false;
bool no_launch = false; bool no_launch = false;
const char* user_path = nullptr; const char* user_path = nullptr;
std::string region;
const char **game_arguments = nullptr; const char **game_arguments = nullptr;
int game_arguments_length = 0; int game_arguments_length = 0;
const char** argv = nullptr; const char** argv = nullptr;
+11 -1
View File
@@ -336,4 +336,14 @@ namespace Utils {
throw std::runtime_error("Game disconnected"); throw std::runtime_error("Game disconnected");
} }
} }
};
inline std::string RegionToTopLevelDomain(const std::string region) {
if (region == "Restricted") {
return "beammp.ru";
}
else if (region == "Developer") {
return "beammp.dev";
}
return "beammp.com"; // Global
}
};
+10 -2
View File
@@ -36,6 +36,10 @@ void ParseConfig(const nlohmann::json& d) {
CachingDirectory = std::filesystem::path(d["CachingDirectory"].get<std::string>()); CachingDirectory = std::filesystem::path(d["CachingDirectory"].get<std::string>());
info(beammp_wide("Mod caching directory: ") + beammp_fs_string(CachingDirectory.relative_path())); info(beammp_wide("Mod caching directory: ") + beammp_fs_string(CachingDirectory.relative_path()));
} }
if (d.contains("Region") && d["Region"].is_string()) {
options.region = d["Region"].get<std::string>();
info("Set the region to: " + options.region);
}
if (d.contains("Dev") && d["Dev"].is_boolean()) { if (d.contains("Dev") && d["Dev"].is_boolean()) {
bool dev = d["Dev"].get<bool>(); bool dev = d["Dev"].get<bool>();
@@ -67,14 +71,18 @@ void ConfigInit() {
} else } else
fatal("Failed to open Launcher.cfg!"); fatal("Failed to open Launcher.cfg!");
} else { } else {
if (options.region.empty())
{
options.region = "Global";
}
std::ofstream cfg("Launcher.cfg"); std::ofstream cfg("Launcher.cfg");
if (cfg.is_open()) { if (cfg.is_open()) {
cfg << cfg <<
R"({ R"({
"Port": 4444, "Port": 4444,
"Build": "Default", "Build": "Default",
"CachingDirectory": "./Resources" "CachingDirectory": "./Resources",
})"; "Region": ")" << options.region << "\"\n}";
cfg.close(); cfg.close();
} else { } else {
fatal("Failed to write config on disk!"); fatal("Failed to write config on disk!");
+9 -10
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);
@@ -227,7 +226,7 @@ void Parse(std::string Data, SOCKET CSocket) {
TCPTerminate = true; TCPTerminate = true;
Data.clear(); Data.clear();
futures.push_back(std::async(std::launch::async, []() { futures.push_back(std::async(std::launch::async, []() {
CoreSend("B" + HTTP::Get("https://backend.beammp.com/servers-info")); CoreSend("B" + HTTP::Get("https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/servers-info"));
})); }));
} }
break; break;
-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);
+4 -3
View File
@@ -6,6 +6,7 @@
#include "Http.h" #include "Http.h"
#include "Options.h"
#include <Logger.h> #include <Logger.h>
#include <Network/network.hpp> #include <Network/network.hpp>
#include <Startup.h> #include <Startup.h>
@@ -136,8 +137,8 @@ void HTTP::StartProxy() {
{ "User-Agent", "BeamMP-Launcher/" + GetVer() + GetPatch() }, { "User-Agent", "BeamMP-Launcher/" + GetVer() + GetPatch() },
{ "Accept", "*/*" } { "Accept", "*/*" }
}; };
httplib::Client backend("https://backend.beammp.com"); httplib::Client backend("https://backend." + Utils::RegionToTopLevelDomain(options.region));
httplib::Client forum("https://forum.beammp.com"); httplib::Client forum("https://forum." + Utils::RegionToTopLevelDomain(options.region));
const std::string pattern = ".*"; const std::string pattern = ".*";
@@ -216,7 +217,7 @@ void HTTP::StartProxy() {
} }
if (error) { if (error) {
cli_res = forum.Get("/user_avatar/forum.beammp.com/user/0/0.png", headers); cli_res = forum.Get("/user_avatar/forum." + Utils::RegionToTopLevelDomain(options.region) + "/user/0/0.png", headers);
} }
} else { } else {
+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 "";
} }
+8
View File
@@ -92,6 +92,13 @@ void InitOptions(int argc, const char *argv[], Options &options) {
} }
options.user_path = argv[i + 1]; options.user_path = argv[i + 1];
i++; i++;
} else if (argument == "--region") {
if (i + 1 >= argc) {
error("You must specify a region after the `--region` argument");
}
options.region = argv[i + 1];
info("Set the region to: " + options.region);
i++;
} else if (argument == "--" || argument == "--game") { } else if (argument == "--" || argument == "--game") {
options.game_arguments = &argv[i + 1]; options.game_arguments = &argv[i + 1];
options.game_arguments_length = argc - i - 1; options.game_arguments_length = argc - i - 1;
@@ -108,6 +115,7 @@ void InitOptions(int argc, const char *argv[], Options &options) {
"\t--no-launch Skip launching the game (you must launch the game manually)\n" "\t--no-launch Skip launching the game (you must launch the game manually)\n"
"\t--dev Developer mode, same as --verbose --no-download --no-launch --no-update\n" "\t--dev Developer mode, same as --verbose --no-download --no-launch --no-update\n"
"\t--user-path <path> Path to BeamNG's User Path\n" "\t--user-path <path> Path to BeamNG's User Path\n"
"\t--region <region> Sets a custom region, options are 'Global', and 'Restricted'\n"
"\t--game <args...> Passes ALL following arguments to the game, see also `--`\n" "\t--game <args...> Passes ALL following arguments to the game, see also `--`\n"
<< std::flush; << std::flush;
exit(0); exit(0);
+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) {
+3 -2
View File
@@ -6,6 +6,7 @@
#include "Http.h" #include "Http.h"
#include "Options.h"
#include "Logger.h" #include "Logger.h"
#include <filesystem> #include <filesystem>
#include <fstream> #include <fstream>
@@ -55,7 +56,7 @@ std::string Login(const std::string& fields) {
} }
info("Attempting to authenticate..."); info("Attempting to authenticate...");
try { try {
std::string Buffer = HTTP::Post("https://auth.beammp.com/userlogin", fields); std::string Buffer = HTTP::Post("https://auth." + Utils::RegionToTopLevelDomain(options.region) + "/userlogin", fields);
if (Buffer.empty()) { if (Buffer.empty()) {
return GetFail("Failed to communicate with the auth system!"); return GetFail("Failed to communicate with the auth system!");
@@ -115,7 +116,7 @@ void CheckLocalKey() {
} }
} }
Buffer = HTTP::Post("https://auth.beammp.com/userlogin", R"({"pk":")" + Buffer + "\"}"); Buffer = HTTP::Post("https://auth." + Utils::RegionToTopLevelDomain(options.region) + "/userlogin", R"({"pk":")" + Buffer + "\"}");
nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false); nlohmann::json d = nlohmann::json::parse(Buffer, nullptr, false);
+5 -5
View File
@@ -331,9 +331,9 @@ bool VerifySignature(const std::filesystem::path& filePath)
#endif #endif
void CheckForUpdates(const std::string& CV) { void CheckForUpdates(const std::string& CV) {
std::string LatestHash = HTTP::Get("https://backend.beammp.com/sha/launcher?branch=" + Branch + "&pk=" + PublicKey); std::string LatestHash = HTTP::Get("https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/sha/launcher?branch=" + Branch + "&pk=" + PublicKey);
std::string LatestVersion = HTTP::Get( std::string LatestVersion = HTTP::Get(
"https://backend.beammp.com/version/launcher?branch=" + Branch + "&pk=" + PublicKey); "https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/version/launcher?branch=" + Branch + "&pk=" + PublicKey);
std::regex sha256_pattern(R"(^[a-fA-F0-9]{64}$)"); std::regex sha256_pattern(R"(^[a-fA-F0-9]{64}$)");
std::smatch match; std::smatch match;
@@ -358,7 +358,7 @@ void CheckForUpdates(const std::string& CV) {
info("Downloading Launcher update " + LatestHash); info("Downloading Launcher update " + LatestHash);
std::wstring DownloadLocation = GetBP() / (beammp_wide("new_") + GetEN()); std::wstring DownloadLocation = GetBP() / (beammp_wide("new_") + GetEN());
if (HTTP::Download( if (HTTP::Download(
"https://backend.beammp.com/builds/launcher?download=true" "https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/builds/launcher?download=true"
"&pk=" "&pk="
+ PublicKey + "&branch=" + Branch, + PublicKey + "&branch=" + Branch,
DownloadLocation, LatestHash)) { DownloadLocation, LatestHash)) {
@@ -514,7 +514,7 @@ void PreGame(const beammp_fs_string& GamePath) {
info(beammp_wide("Game user path: ") + beammp_fs_string(GetGamePath())); info(beammp_wide("Game user path: ") + beammp_fs_string(GetGamePath()));
if (!options.no_download) { if (!options.no_download) {
std::string LatestHash = HTTP::Get("https://backend.beammp.com/sha/mod?branch=" + Branch + "&pk=" + PublicKey); std::string LatestHash = HTTP::Get("https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/sha/mod?branch=" + Branch + "&pk=" + PublicKey);
transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower); transform(LatestHash.begin(), LatestHash.end(), LatestHash.begin(), ::tolower);
LatestHash.erase(std::remove_if(LatestHash.begin(), LatestHash.end(), LatestHash.erase(std::remove_if(LatestHash.begin(), LatestHash.end(),
[](auto const& c) -> bool { return !std::isalnum(c); }), [](auto const& c) -> bool { return !std::isalnum(c); }),
@@ -548,7 +548,7 @@ void PreGame(const beammp_fs_string& GamePath) {
if (FileHash != LatestHash) { if (FileHash != LatestHash) {
info("Downloading BeamMP Update " + LatestHash); info("Downloading BeamMP Update " + LatestHash);
HTTP::Download("https://backend.beammp.com/builds/client?download=true" HTTP::Download("https://backend." + Utils::RegionToTopLevelDomain(options.region) + "/builds/client?download=true"
"&pk=" "&pk="
+ PublicKey + "&branch=" + Branch, + PublicKey + "&branch=" + Branch,
ZipPath, LatestHash); ZipPath, LatestHash);