From 809080c9aa14474f1ea2a86804e53855ba68a8b2 Mon Sep 17 00:00:00 2001
From: Katharine Chui <katharine.chui@gmail.com>
Date: Thu, 30 Apr 2026 19:51:13 +0200
Subject: [PATCH] use RecvWaitAll outside of VehicleEvent.cpp as well

---
 include/Network/network.hpp | 1 +
 src/Network/Core.cpp        | 4 ++--
 src/Network/Resources.cpp   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/Network/network.hpp b/include/Network/network.hpp
index f58bdad..94e4fb5 100644
--- a/include/Network/network.hpp
+++ b/include/Network/network.hpp
@@ -56,3 +56,4 @@ void UDPClientMain(const std::string& IP, int Port);
 void TCPGameServer(const std::string& IP, int Port);
 bool SecurityWarning();
 void CoreSend(std::string data);
+int RecvWaitAll(int sockfd, char *buf, int len);
diff --git a/src/Network/Core.cpp b/src/Network/Core.cpp
index bcb8050..9dec167 100644
--- a/src/Network/Core.cpp
+++ b/src/Network/Core.cpp
@@ -143,7 +143,7 @@ void GetServerInfo(std::string Data) {
     const std::string buffer = ([&]() -> std::string {
         int32_t 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 {
             if (bytes == 0) {
@@ -164,7 +164,7 @@ void GetServerInfo(std::string Data) {
         }
 
         data.resize(Header, 0);
-        Temp = recv(ISock, data.data(), Header, MSG_WAITALL);
+        Temp = RecvWaitAll(ISock, data.data(), Header);
         if (!checkBytes(Temp)) {
             return "";
         }
diff --git a/src/Network/Resources.cpp b/src/Network/Resources.cpp
index 1696dde..26bc62e 100644
--- a/src/Network/Resources.cpp
+++ b/src/Network/Resources.cpp
@@ -164,7 +164,7 @@ std::vector<char> TCPRcvRaw(SOCKET Sock, uint64_t& GRcv, uint64_t Size) {
     do {
         // receive at most some MB at a time
         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) {
             debug("Recv returned: " + std::to_string(Temp));
             if (Temp == -1) {