mirror of
https://github.com/BeamMP/BeamMP-Launcher.git
synced 2026-06-22 08:31:07 +00:00
use RecvWaitAll outside of VehicleEvent.cpp as well
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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 "";
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user