mirror of
https://github.com/BeamMP/BeamMP-Launcher.git
synced 2026-08-28 21:10:59 +00:00
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 92cf7a9c67 | |||
| 89f564f09d | |||
| 2bb5686c68 | |||
| f8c9fd7992 | |||
| d3daa6621c | |||
| a9faac25fc | |||
| f532e58ee0 | |||
| 8b4fefd518 | |||
| 5fc8f580f4 | |||
| 6334a0a915 | |||
| 44211e7235 | |||
| 901b7df809 | |||
| a6e3db6b08 | |||
| eeca50b37e | |||
| 2a92a08587 |
@@ -51,6 +51,10 @@ int KillSocket(uint64_t Dead) {
|
||||
}
|
||||
|
||||
void GameSend(std::string_view Data) {
|
||||
if (!GConnected) {
|
||||
debug("Tried to call GameSend but socket was not connected. Data: " + std::string(Data));
|
||||
return;
|
||||
}
|
||||
static std::mutex Lock;
|
||||
std::scoped_lock Guard(Lock);
|
||||
auto ToSend = Utils::PrependHeader<std::string_view>(Data);
|
||||
@@ -195,6 +199,7 @@ void ParserAsync(std::string_view Data) {
|
||||
return;
|
||||
case 'U':
|
||||
magic = Data.substr(1);
|
||||
return;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -163,7 +163,12 @@ std::vector<char> TCPRcvRaw(SOCKET Sock, uint64_t& GRcv, uint64_t Size) {
|
||||
int i = 0;
|
||||
do {
|
||||
// receive at most some MB at a time
|
||||
int Len = std::min(int(Size - Rcv), 1 * 1024 * 1024);
|
||||
uint64_t Len = std::min<uint64_t>((Size - Rcv), 1 * 1024 * 1024);
|
||||
if (Len == 0) {
|
||||
error("Download size miscalculation");
|
||||
break;
|
||||
}
|
||||
|
||||
int Temp = RecvWaitAll(Sock, &File[Rcv], Len);
|
||||
if (Temp == -1 || Temp == 0) {
|
||||
debug("Recv returned: " + std::to_string(Temp));
|
||||
@@ -302,7 +307,7 @@ void InvalidResource(const std::string& File) {
|
||||
}
|
||||
|
||||
struct ModInfo {
|
||||
static std::pair<bool, std::vector<ModInfo>> ParseModInfosFromPacket(const std::string& packet) {
|
||||
static std::optional<std::pair<bool, std::vector<ModInfo>>> ParseModInfosFromPacket(const std::string& packet) {
|
||||
bool success = false;
|
||||
std::vector<ModInfo> modInfos;
|
||||
try {
|
||||
@@ -323,6 +328,12 @@ struct ModInfo {
|
||||
modInfo.Protected = entry["protected"];
|
||||
}
|
||||
|
||||
if (auto fsFile = std::filesystem::path(modInfo.FileName);
|
||||
!fsFile.has_filename() || fsFile.filename().string() != modInfo.FileName ||
|
||||
!fsFile.filename().has_extension() || fsFile.filename().extension() != ".zip"){
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
modInfos.push_back(modInfo);
|
||||
success = true;
|
||||
}
|
||||
@@ -578,8 +589,17 @@ void NewSyncResources(SOCKET Sock, const std::string& Mods, const std::vector<Mo
|
||||
c = ::tolower(c);
|
||||
}
|
||||
#endif
|
||||
auto name = std::filesystem::path(GetGamePath()) / "mods/multiplayer" / FName;
|
||||
auto tmp_name = name;
|
||||
tmp_name += ".tmp";
|
||||
|
||||
fs::copy_file(PathToSaveTo, std::filesystem::path(GetGamePath()) / "mods/multiplayer" / FName, fs::copy_options::overwrite_existing);
|
||||
std::error_code ec;
|
||||
fs::copy_file(PathToSaveTo, tmp_name, fs::copy_options::overwrite_existing, ec);
|
||||
if (ec) {
|
||||
error(beammp_wide("Error in copy_file during download of ") + beammp_fs_string(PathToSaveTo) + beammp_wide(": ") + Utils::ToWString(ec.message()));
|
||||
break;
|
||||
}
|
||||
fs::rename(tmp_name, name);
|
||||
UpdateModUsage(FName);
|
||||
}
|
||||
WaitForConfirm();
|
||||
@@ -602,7 +622,13 @@ void SyncResources(SOCKET Sock) {
|
||||
if (Ret.starts_with("R")) {
|
||||
debug("This server is likely outdated, not trying to parse new mod info format");
|
||||
} else {
|
||||
auto [success, modInfo] = ModInfo::ParseModInfosFromPacket(Ret);
|
||||
auto ParsedInfo = ModInfo::ParseModInfosFromPacket(Ret);
|
||||
if (!ParsedInfo.has_value()) {
|
||||
error("Invalid mod info");
|
||||
Terminate = true;
|
||||
return;
|
||||
}
|
||||
auto [success, modInfo] = ParsedInfo.value();
|
||||
|
||||
if (success) {
|
||||
NewSyncResources(Sock, Ret, modInfo);
|
||||
@@ -738,7 +764,12 @@ void SyncResources(SOCKET Sock) {
|
||||
}
|
||||
#endif
|
||||
|
||||
fs::copy_file(PathToSaveTo, GetGamePath() / beammp_wide("mods/multiplayer") / Utils::ToWString(FName), fs::copy_options::overwrite_existing);
|
||||
auto name = GetGamePath() / beammp_wide("mods/multiplayer") / Utils::ToWString(FName);
|
||||
auto tmp_name = name;
|
||||
tmp_name += L".tmp";
|
||||
|
||||
fs::copy_file(PathToSaveTo, tmp_name, fs::copy_options::overwrite_existing);
|
||||
fs::rename(tmp_name, name);
|
||||
UpdateModUsage(FN->substr(pos));
|
||||
}
|
||||
WaitForConfirm();
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
#include "Network/network.hpp"
|
||||
#include "Zlib/Compressor.h"
|
||||
#include <stdexcept>
|
||||
#include <thread>
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include <ws2tcpip.h>
|
||||
@@ -21,12 +22,17 @@
|
||||
|
||||
#include "Logger.h"
|
||||
#include <array>
|
||||
#include <future>
|
||||
#include <mutex>
|
||||
#include <string>
|
||||
|
||||
SOCKET UDPSock = -1;
|
||||
sockaddr_in* ToServer = nullptr;
|
||||
|
||||
std::mutex UDPSendMutex;
|
||||
|
||||
void UDPSend(std::string Data) {
|
||||
std::scoped_lock lock(UDPSendMutex);
|
||||
if (ClientID == -1 || UDPSock == -1)
|
||||
return;
|
||||
if (Data.length() > 400) {
|
||||
@@ -78,6 +84,7 @@ void UDPRcv() {
|
||||
Ret[Rcv] = 0;
|
||||
UDPParser(std::string_view(Ret.data(), Rcv));
|
||||
}
|
||||
|
||||
void UDPClientMain(const std::string& IP, int Port) {
|
||||
#ifdef _WIN32
|
||||
WSADATA data;
|
||||
@@ -93,9 +100,16 @@ void UDPClientMain(const std::string& IP, int Port) {
|
||||
ToServer->sin_port = htons(Port);
|
||||
inet_pton(AF_INET, IP.c_str(), &ToServer->sin_addr);
|
||||
UDPSock = socket(AF_INET, SOCK_DGRAM, 0);
|
||||
if (!magic.empty())
|
||||
for (int i = 0; i < 10; i++)
|
||||
std::future<void> magicSend;
|
||||
|
||||
if (!magic.empty()) {
|
||||
magicSend = std::async(std::launch::async, ([](){
|
||||
for (int i = 0; i < 10; i++) {
|
||||
UDPSend(magic);
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(50));
|
||||
}
|
||||
}));
|
||||
}
|
||||
GameSend("P" + std::to_string(ClientID));
|
||||
TCPSend("H", TCPSock);
|
||||
UDPSend("p");
|
||||
@@ -104,6 +118,11 @@ void UDPClientMain(const std::string& IP, int Port) {
|
||||
UDPRcv();
|
||||
}
|
||||
debug("UDP receive loop done");
|
||||
|
||||
if (magicSend.valid()) {
|
||||
magicSend.get();
|
||||
}
|
||||
|
||||
KillSocket(UDPSock);
|
||||
WSACleanup();
|
||||
}
|
||||
|
||||
+1
-1
@@ -86,7 +86,7 @@ std::string GetVer() {
|
||||
return "2.8";
|
||||
}
|
||||
std::string GetPatch() {
|
||||
return ".0";
|
||||
return ".1";
|
||||
}
|
||||
|
||||
beammp_fs_string GetEP(const beammp_fs_char* P) {
|
||||
|
||||
Reference in New Issue
Block a user