SantaSpeen/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/SantaSpeen/BeamMP-Server.git synced 2025-07-04 04:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix setsockopt SO_SNDTIMEO for windows, bump version number to 3.0.2, update commandline

Browse Source
This commit is contained in:
Lion Kortlepel 2022-04-05 10:58:42 +02:00
parent 4ff69528bd
commit 1bab3276e9
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/commandline vendored

@ -1 +1 @@
Subproject commit 01434c11aaf82d37a126dc70f5aa02cc523dbbb4 Subproject commit b1da8bcb696bfa9388dca46bf0f5dd9538fc70aa

4
include/Common.h
View File

@ -7,12 +7,12 @@ extern TSentry Sentry;
#include <atomic> #include <atomic>
#include <cstring> #include <cstring>
#include <deque> #include <deque>
#include <filesystem>
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <mutex> #include <mutex>
#include <sstream> #include <sstream>
#include <zlib.h> #include <zlib.h>
#include <filesystem>
#include "Compat.h" #include "Compat.h"
@ -121,7 +121,7 @@ private:
static inline std::mutex mShutdownHandlersMutex {}; static inline std::mutex mShutdownHandlersMutex {};
static inline std::deque<TShutdownHandler> mShutdownHandlers {}; static inline std::deque<TShutdownHandler> mShutdownHandlers {};
static inline Version mVersion { 3, 0, 1 }; static inline Version mVersion { 3, 0, 2 };
}; };
std::string ThreadName(bool DebugModeOverride = false); std::string ThreadName(bool DebugModeOverride = false);

6
src/TNetwork.cpp
View File

@ -154,10 +154,10 @@ void TNetwork::TCPServerMain() {
beammp_warn(("Got an invalid client socket on connect! Skipping...")); beammp_warn(("Got an invalid client socket on connect! Skipping..."));
continue; continue;
} }
// set timeout // set timeout (DWORD, aka uint32_t)
size_t SendTimeoutMS = 30 * 1000; uint32_t SendTimeoutMS = 30 * 1000;
#if defined(BEAMMP_WINDOWS) #if defined(BEAMMP_WINDOWS)
int ret = ::setsockopt(client.Socket, SOL_SOCKET, SO_SNDTIMEO, reinterpret_cast<const char*>(&ms), sizeof(ms)); int ret = ::setsockopt(client.Socket, SOL_SOCKET, SO_SNDTIMEO, reinterpret_cast<const char*>(&SendTimeoutMS), sizeof(SendTimeoutMS));
#else // POSIX #else // POSIX
struct timeval optval; struct timeval optval;
optval.tv_sec = (int)(SendTimeoutMS / 1000); optval.tv_sec = (int)(SendTimeoutMS / 1000);