Add debug log for specific data condition in ServerSend

src/Network/GlobalHandler.cpp

@@ -51,10 +51,6 @@ 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);
@@ -65,6 +61,10 @@ void GameSend(std::string_view Data) {
 }
 
 void ServerSend(std::string Data, bool Rel) {
+   if (Data.length() > 1 && Data[0] == 't') {
+    debug("hey");
+   }
+ 
     if (Terminate || Data.empty())
         return;
     if (Data.find("Zp") != std::string::npos && Data.size() > 500) {
@@ -199,10 +199,13 @@ void ParserAsync(std::string_view Data) {
         return;
     case 'U':
         magic = Data.substr(1);
-        return;
     default:
         break;
     }
+    if (Data.length() > 1 && Data[0] == 't') {
+        debug("omg?");
+        debug(Data.data());
+    }
     GameSend(Data);
 }
 void ServerParser(std::string_view Data) {

src/Network/Resources.cpp

@@ -163,12 +163,7 @@ std::vector<char> TCPRcvRaw(SOCKET Sock, uint64_t& GRcv, uint64_t Size) {
     int i = 0;
     do {
         // receive at most some MB at a time
-        uint64_t Len = std::min<uint64_t>((Size - Rcv), 1 * 1024 * 1024);
+        int Len = std::min(int(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));
@@ -307,7 +302,7 @@ void InvalidResource(const std::string& File) {
 }
 
 struct ModInfo {
-    static std::optional<std::pair<bool, std::vector<ModInfo>>> ParseModInfosFromPacket(const std::string& packet) {
+    static std::pair<bool, std::vector<ModInfo>> ParseModInfosFromPacket(const std::string& packet) {
         bool success = false;
         std::vector<ModInfo> modInfos;
         try {
@@ -328,12 +323,6 @@ 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;
             }
@@ -589,17 +578,8 @@ 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";
 
-            std::error_code ec;
+            fs::copy_file(PathToSaveTo, std::filesystem::path(GetGamePath()) / "mods/multiplayer" / FName, fs::copy_options::overwrite_existing);
-            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();
@@ -622,13 +602,7 @@ 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 ParsedInfo = ModInfo::ParseModInfosFromPacket(Ret);
+        auto [success, modInfo] = 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);
@@ -764,12 +738,7 @@ void SyncResources(SOCKET Sock) {
             }
 #endif
 
-            auto name = GetGamePath() / beammp_wide("mods/multiplayer") / Utils::ToWString(FName);
+            fs::copy_file(PathToSaveTo, GetGamePath() / beammp_wide("mods/multiplayer") / Utils::ToWString(FName), fs::copy_options::overwrite_existing);
-            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();

src/Network/VehicleData.cpp

@@ -7,7 +7,6 @@
 #include "Network/network.hpp"
 #include "Zlib/Compressor.h"
 #include <stdexcept>
-#include <thread>
 
 #if defined(_WIN32)
 #include <ws2tcpip.h>
@@ -22,17 +21,12 @@
 
 #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) {
@@ -84,7 +78,6 @@ void UDPRcv() {
     Ret[Rcv] = 0;
     UDPParser(std::string_view(Ret.data(), Rcv));
 }
-
 void UDPClientMain(const std::string& IP, int Port) {
 #ifdef _WIN32
     WSADATA data;
@@ -100,16 +93,9 @@ 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);
-    std::future<void> magicSend;
+    if (!magic.empty())
-
+        for (int i = 0; i < 10; i++)
-    if (!magic.empty()) {
+            UDPSend(magic);
-        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");
@@ -118,11 +104,6 @@ void UDPClientMain(const std::string& IP, int Port) {
         UDPRcv();
     }
     debug("UDP receive loop done");
-
-    if (magicSend.valid()) {
-        magicSend.get();
-    }
-
     KillSocket(UDPSock);
     WSACleanup();
 }

src/Startup.cpp

@@ -86,7 +86,7 @@ std::string GetVer() {
     return "2.8";
 }
 std::string GetPatch() {
-    return ".1";
+    return ".0";
 }
 
 beammp_fs_string GetEP(const beammp_fs_char* P) {