fix typos and phrasing in README.md

Signed-off-by: Lucca Jiménez Könings <development@jimkoen.com>

.github/workflows/release.yml

@@ -119,6 +119,7 @@ jobs:
             version: 20.04
     env:
       VCPKG_DEFAULT_TRIPLET: "arm64-linux"
+      VCPKG_FORCE_SYSTEM_BINARIES: 1
     container:
       image: ${{ matrix.distro }}:${{ matrix.version }}
     steps:

README.md

@@ -42,7 +42,7 @@ We only allow building unmodified (original) source code for public use. `master
 
 ## Supported Operating Systems
 
-The code itself supports (latest stable) Linux and Windows. In terms of actual build support, for now we usually only distribute Windows binaries and Linux. For any other distro or OS, you just have to find the same libraries listed in [Runtime Dependencies](#runtime-dependencies) further down the page, and it should build fine.
+The code itself supports (latest stable) Linux, Windows and FreeBSD. In terms of actual build support, for now we usually only distribute Windows binaries and Linux. For any other distro or OS, you just have to find the same libraries listed in [Runtime Dependencies](#runtime-dependencies) further down the page, and it should build fine.
 
 Recommended compilers: MSVC, GCC, CLANG. 
 
@@ -71,6 +71,14 @@ You can build on **Windows, Linux** or other platforms by following these steps:
 5. Your executable can be found in `bin/`.
 
 When you make changes to the code, you only have to run step 4 again.
+### Building for FreeBSD
+Building is only supported for major release branches of FreeBSD that are currently not EOL. The build process is the same as on Linux, although build dependencies can be universally installed from ports via pkg:
+```
+pkg install git cmake-core zip bash devel/ninja devel/pkgconf lua53
+```
+After installing the necessary build dependencies, follow the Linux build instructions beginning from step 3. Beware that running the initial cmake command will compile vcpkg from source, as vcpkg has no native FreeBSD port - this may take some time.
+
+On systems with a single logical CPU core, `make` may fail to build the server when using the `--parallel` option when calling CMake. If you see error messages related to make, simply omit the `--parallel` from the command: `cmake --build bin --config Release -t BeamMP-Server`.
 
 ### Runtime Dependencies
 

include/Client.h

@@ -10,8 +10,6 @@
 #include "BoostAliases.h"
 #include "Common.h"
 #include "Compat.h"
-#include "RWMutex.h"
-#include "Sync.h"
 #include "VehicleData.h"
 
 class TServer;
@@ -30,6 +28,11 @@ class TClient final {
 public:
     using TSetOfVehicleData = std::vector<TVehicleData>;
 
+    struct TVehicleDataLockPair {
+        TSetOfVehicleData* VehicleData;
+        std::unique_lock<std::mutex> Lock;
+    };
+
     TClient(TServer& Server, ip::tcp::socket&& Socket);
     TClient(const TClient&) = delete;
     ~TClient();
@@ -38,51 +41,76 @@ public:
     void AddNewCar(int Ident, const std::string& Data);
     void SetCarData(int Ident, const std::string& Data);
     void SetCarPosition(int Ident, const std::string& Data);
-
-    void SetName(const std::string& NewName) { Name = NewName; }
-    void SetRoles(const std::string& NewRole) { Role = NewRole; }
-    void SetIdentifier(const std::string& key, const std::string& value);
+    TVehicleDataLockPair GetAllCars();
+    void SetName(const std::string& Name) { mName = Name; }
+    void SetRoles(const std::string& Role) { mRole = Role; }
+    void SetIdentifier(const std::string& key, const std::string& value) { mIdentifiers[key] = value; }
     std::string GetCarData(int Ident);
     std::string GetCarPositionRaw(int Ident);
-    bool IsDisconnected() const { return !TCPSocket->is_open(); }
+    void SetUDPAddr(const ip::udp::endpoint& Addr) { mUDPAddress = Addr; }
+    void SetDownSock(ip::tcp::socket&& CSock) { mDownSocket = std::move(CSock); }
+    void SetTCPSock(ip::tcp::socket&& CSock) { mSocket = std::move(CSock); }
+    void Disconnect(std::string_view Reason);
+    bool IsDisconnected() const { return !mSocket.is_open(); }
     // locks
     void DeleteCar(int Ident);
+    [[nodiscard]] const std::unordered_map<std::string, std::string>& GetIdentifiers() const { return mIdentifiers; }
+    [[nodiscard]] const ip::udp::endpoint& GetUDPAddr() const { return mUDPAddress; }
+    [[nodiscard]] ip::udp::endpoint& GetUDPAddr() { return mUDPAddress; }
+    [[nodiscard]] ip::tcp::socket& GetDownSock() { return mDownSocket; }
+    [[nodiscard]] const ip::tcp::socket& GetDownSock() const { return mDownSocket; }
+    [[nodiscard]] ip::tcp::socket& GetTCPSock() { return mSocket; }
+    [[nodiscard]] const ip::tcp::socket& GetTCPSock() const { return mSocket; }
+    [[nodiscard]] std::string GetRoles() const { return mRole; }
+    [[nodiscard]] std::string GetName() const { return mName; }
+    void SetUnicycleID(int ID) { mUnicycleID = ID; }
+    void SetID(int ID) { mID = ID; }
     [[nodiscard]] int GetOpenCarID() const;
     [[nodiscard]] int GetCarCount() const;
     void ClearCars();
+    [[nodiscard]] int GetID() const { return mID; }
+    [[nodiscard]] int GetUnicycleID() const { return mUnicycleID; }
+    [[nodiscard]] bool IsConnected() const { return mIsConnected; }
+    [[nodiscard]] bool IsSynced() const { return mIsSynced; }
+    [[nodiscard]] bool IsSyncing() const { return mIsSyncing; }
+    [[nodiscard]] bool IsGuest() const { return mIsGuest; }
+    void SetIsGuest(bool NewIsGuest) { mIsGuest = NewIsGuest; }
+    void SetIsSynced(bool NewIsSynced) { mIsSynced = NewIsSynced; }
+    void SetIsSyncing(bool NewIsSyncing) { mIsSyncing = NewIsSyncing; }
     void EnqueuePacket(const std::vector<uint8_t>& Packet);
-    void SetIsConnected(bool NewIsConnected) { IsConnected = NewIsConnected; }
+    [[nodiscard]] std::queue<std::vector<uint8_t>>& MissedPacketQueue() { return mPacketsSync; }
+    [[nodiscard]] const std::queue<std::vector<uint8_t>>& MissedPacketQueue() const { return mPacketsSync; }
+    [[nodiscard]] size_t MissedPacketQueueSize() const { return mPacketsSync.size(); }
+    [[nodiscard]] std::mutex& MissedPacketQueueMutex() const { return mMissedPacketsMutex; }
+    void SetIsConnected(bool NewIsConnected) { mIsConnected = NewIsConnected; }
     [[nodiscard]] TServer& Server() const;
     void UpdatePingTime();
     int SecondsSinceLastPing();
 
-    Sync<bool> IsConnected = false;
-    Sync<bool> IsSynced = false;
-    Sync<bool> IsSyncing = false;
-    Sync<std::unordered_map<std::string, std::string>> Identifiers;
-    Sync<ip::tcp::socket> TCPSocket;
-    Sync<ip::tcp::socket> DownSocket;
-    Sync<ip::udp::endpoint> UDPAddress {};
-    Sync<int> UnicycleID = -1;
-    Sync<std::string> Role;
-    Sync<std::string> DID;
-    Sync<int> ID = -1;
-    Sync<bool> IsGuest = false;
-    Sync<std::string> Name = std::string("Unknown Client");
-    Sync<TSetOfVehicleData> VehicleData;
-    Sync<SparseArray<std::string>> VehiclePosition;
-    Sync<std::queue<std::vector<uint8_t>>> MissedPacketsQueue;
-    Sync<std::chrono::time_point<std::chrono::high_resolution_clock>> LastPingTime;
-
-    friend class TNetwork;
-
 private:
-    /// ONLY call after the client has been cleaned up, all cars deleted, etc.
-    void CloseSockets(std::string_view Reason);
-
     void InsertVehicle(int ID, const std::string& Data);
 
     TServer& mServer;
+    bool mIsConnected = false;
+    bool mIsSynced = false;
+    bool mIsSyncing = false;
+    mutable std::mutex mMissedPacketsMutex;
+    std::queue<std::vector<uint8_t>> mPacketsSync;
+    std::unordered_map<std::string, std::string> mIdentifiers;
+    bool mIsGuest = false;
+    mutable std::mutex mVehicleDataMutex;
+    mutable std::mutex mVehiclePositionMutex;
+    TSetOfVehicleData mVehicleData;
+    SparseArray<std::string> mVehiclePosition;
+    std::string mName = "Unknown Client";
+    ip::tcp::socket mSocket;
+    ip::tcp::socket mDownSocket;
+    ip::udp::endpoint mUDPAddress {};
+    int mUnicycleID = -1;
+    std::string mRole;
+    std::string mDID;
+    int mID = -1;
+    std::chrono::time_point<std::chrono::high_resolution_clock> mLastPingTime;
 };
 
-std::optional<std::shared_ptr<TClient>> GetClient(class TServer& Server, int ID);
+std::optional<std::weak_ptr<TClient>> GetClient(class TServer& Server, int ID);

include/Compat.h

@@ -9,7 +9,17 @@
 #include <termios.h>
 #include <unistd.h>
 char _getch();
-#endif // unix
+#endif // linux
+
+#ifdef BEAMMP_FREEBSD
+#include <errno.h>
+#include <termios.h>
+#include <unistd.h>
+char _getch();
+// macros 'major' and 'minor' need to be undefined on FreeBSD to avoid naming collision with system headers
+#undef major
+#undef minor
+#endif // freebsd
 
 // ======================= APPLE ========================
 

include/Environment.h

@@ -3,11 +3,13 @@
 // one of BEAMMP_{WINDOWS,LINUX,APPLE} will be set at the end of this
 
 // clang-format off
-#if !defined(BEAMMP_WINDOWS) && !defined(BEAMMP_UNIX) && !defined(BEAMMP_APPLE)
+#if !defined(BEAMMP_WINDOWS) && !defined(BEAMMP_UNIX) && !defined(BEAMMP_APPLE) && !defined(BEAMMP_FREEBSD)
     #if defined(_WIN32) || defined(__CYGWIN__)
         #define BEAMMP_WINDOWS
-    #elif defined(__linux__) || defined(__linux) || defined(linux) || defined(__unix__) || defined(__unix) || defined(unix)
+    #elif defined(__linux__) || defined(__linux) || defined(linux)
         #define BEAMMP_LINUX
+    #elif defined(__FreeBSD__)
+	#define BEAMMP_FREEBSD
     #elif defined(__APPLE__) || defined(__MACH__)
         #define BEAMMP_APPLE
     #else

include/Sync.h

@@ -1,9 +0,0 @@
-#pragma once
-
-#include <boost/thread/synchronized_value.hpp>
-
-/// This header provides convenience aliases for synchronization primitives.
-
-template<typename T>
-using Sync = boost::synchronized_value<T>;
-

include/TLuaEngine.h

@@ -220,8 +220,6 @@ private:
         // Debug functions, slow
         std::queue<std::pair<TLuaChunk, std::shared_ptr<TLuaResult>>> Debug_GetStateExecuteQueue();
         std::vector<TLuaEngine::QueuedFunction> Debug_GetStateFunctionQueue();
-        
-        sol::table Lua_JsonDecode(const std::string& str);
 
     private:
         sol::table Lua_TriggerGlobalEvent(const std::string& EventName, sol::variadic_args EventArgs);
@@ -232,6 +230,7 @@ private:
         sol::table Lua_GetPlayerVehicles(int ID);
         std::pair<sol::table, std::string> Lua_GetPositionRaw(int PID, int VID);
         sol::table Lua_HttpCreateConnection(const std::string& host, uint16_t port);
+        sol::table Lua_JsonDecode(const std::string& str);
         int Lua_GetPlayerIDByName(const std::string& Name);
         sol::table Lua_FS_ListFiles(const std::string& Path);
         sol::table Lua_FS_ListDirectories(const std::string& Path);

include/TNetwork.h

@@ -19,9 +19,6 @@ public:
     std::shared_ptr<TClient> CreateClient(ip::tcp::socket&& TCPSock);
     std::vector<uint8_t> TCPRcv(TClient& c);
     void ClientKick(TClient& c, const std::string& R);
-    void Disconnect(const std::shared_ptr<TClient>& ClientPtr);
-    void Disconnect(const std::weak_ptr<TClient>& ClientPtr);
-    void Disconnect(TClient& Client);
     [[nodiscard]] bool SyncClient(const std::weak_ptr<TClient>& c);
     void Identify(TConnection&& client);
     std::shared_ptr<TClient> Authentication(TConnection&& ClientConnection);
@@ -44,13 +41,15 @@ private:
     std::vector<uint8_t> UDPRcvFromClient(ip::udp::endpoint& ClientEndpoint);
     void HandleDownload(TConnection&& TCPSock);
     void OnConnect(const std::weak_ptr<TClient>& c);
-    void TCPClient(const std::shared_ptr<TClient>& c);
-    void Looper(const std::shared_ptr<TClient>& c);
+    void TCPClient(const std::weak_ptr<TClient>& c);
+    void Looper(const std::weak_ptr<TClient>& c);
+    int OpenID();
+    void OnDisconnect(const std::weak_ptr<TClient>& ClientPtr);
     void Parse(TClient& c, const std::vector<uint8_t>& Packet);
     void SendFile(TClient& c, const std::string& Name);
-    bool TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
-    void SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name);
-    const uint8_t* SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
+    static bool TCPSendRaw(TClient& C, ip::tcp::socket& socket, const uint8_t* Data, size_t Size);
+    static void SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std::string& Name);
+    static const uint8_t* SendSplit(TClient& c, ip::tcp::socket& Socket, const uint8_t* DataPtr, size_t Size);
 };
 
 std::string HashPassword(const std::string& str);

include/TServer.h

@@ -22,18 +22,14 @@ public:
 
     void InsertClient(const std::shared_ptr<TClient>& Ptr);
     void RemoveClient(const std::weak_ptr<TClient>&);
-    void RemoveClient(TClient&);
     // in Fn, return true to continue, return false to break
-    void ForEachClient(const std::function<bool(const std::shared_ptr<TClient>&)> Fn);
+    void ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn);
     size_t ClientCount() const;
 
-    void GlobalParser(const std::shared_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
+    void GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network);
     static void HandleEvent(TClient& c, const std::string& Data);
     RWMutex& GetClientMutex() const { return mClientsMutex; }
 
-    // thread-safe ID lookup & claim
-    void ClaimFreeIDFor(TClient& Client);
-
     const TScopedTimer UptimeTimer;
 
     // asio io context

scripts/debian-11/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/debian-12/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/ubuntu-20.04/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/ubuntu-22.04/2-configure.sh

@@ -4,4 +4,4 @@ set -ex
 
 ./vcpkg/bootstrap-vcpkg.sh
 
-cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,--build-id=none -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON
+cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-O3 -g -Wl,-z,norelro -Wl,--hash-style=gnu -Wl,-z,noseparate-code -ffunction-sections -fdata-sections -Wl,--gc-sections" -DBeamMP-Server_ENABLE_LTO=ON

scripts/windows/1-configure.sh

@@ -2,6 +2,6 @@
 
 set -ex
 
-./vcpkg/vcpkg add port lua
+vcpkg add port lua
 
 cmake . -B bin $1 -DCMAKE_BUILD_TYPE=Release -DBeamMP-Server_ENABLE_LTO=ON -DVCPKG_TARGET_TRIPLET=x64-windows-static

src/Client.cpp

@@ -7,28 +7,29 @@
 
 void TClient::DeleteCar(int Ident) {
     // TODO: Send delete packets
-    auto VehData = VehicleData.synchronize();
-    auto iter = std::find_if(VehData->begin(), VehData->end(), [&](auto& elem) {
+    std::unique_lock lock(mVehicleDataMutex);
+    auto iter = std::find_if(mVehicleData.begin(), mVehicleData.end(), [&](auto& elem) {
         return Ident == elem.ID();
     });
-    if (iter != VehData->end()) {
-        VehData->erase(iter);
+    if (iter != mVehicleData.end()) {
+        mVehicleData.erase(iter);
     } else {
         beammp_debug("tried to erase a vehicle that doesn't exist (not an error)");
     }
 }
 
 void TClient::ClearCars() {
-    VehicleData->clear();
+    std::unique_lock lock(mVehicleDataMutex);
+    mVehicleData.clear();
 }
 
 int TClient::GetOpenCarID() const {
     int OpenID = 0;
     bool found;
-    auto VehData = VehicleData.synchronize();
+    std::unique_lock lock(mVehicleDataMutex);
     do {
         found = true;
-        for (auto& v : *VehData) {
+        for (auto& v : mVehicleData) {
             if (v.ID() == OpenID) {
                 OpenID++;
                 found = false;
@@ -39,49 +40,46 @@ int TClient::GetOpenCarID() const {
 }
 
 void TClient::AddNewCar(int Ident, const std::string& Data) {
-    VehicleData->emplace_back(Ident, Data);
+    std::unique_lock lock(mVehicleDataMutex);
+    mVehicleData.emplace_back(Ident, Data);
+}
+
+TClient::TVehicleDataLockPair TClient::GetAllCars() {
+    return { &mVehicleData, std::unique_lock(mVehicleDataMutex) };
 }
 
 std::string TClient::GetCarPositionRaw(int Ident) {
+    std::unique_lock lock(mVehiclePositionMutex);
     try {
-        return VehiclePosition->at(size_t(Ident));
+        return mVehiclePosition.at(size_t(Ident));
     } catch (const std::out_of_range& oor) {
-        beammp_debugf("GetCarPositionRaw failed for id {}, as that car doesn't exist on client id {}: {}", Ident, int(ID), oor.what());
+        beammp_debugf("Failed to get vehicle position for {}: {}", Ident, oor.what());
         return "";
     }
 }
 
-void TClient::CloseSockets(std::string_view Reason) {
-    auto LockedSocket = TCPSocket.synchronize();
-    beammp_debugf("Disconnecting client {} for reason: {}", int(ID), Reason);
+void TClient::Disconnect(std::string_view Reason) {
+    beammp_debugf("Disconnecting client {} for reason: {}", GetID(), Reason);
     boost::system::error_code ec;
-    LockedSocket->shutdown(socket_base::shutdown_both, ec);
+    mSocket.shutdown(socket_base::shutdown_both, ec);
     if (ec) {
-        beammp_debugf("Failed to shutdown client socket of client {}: {}", ID.get(), ec.message());
+        beammp_debugf("Failed to shutdown client socket: {}", ec.message());
     }
-    LockedSocket->close(ec);
+    mSocket.close(ec);
     if (ec) {
-        beammp_debugf("Failed to close client socket of client {}: {}", ID.get(), ec.message());
-    }
-    DownSocket->shutdown(socket_base::shutdown_both, ec);
-    if (ec) {
-        beammp_debugf("Failed to shutdown client download socket of client {}: {}", ID.get(), ec.message());
-    }
-    DownSocket->close(ec);
-    if (ec) {
-        beammp_debugf("Failed to close client download socket of client {}: {}", ID.get(), ec.message());
+        beammp_debugf("Failed to close client socket: {}", ec.message());
     }
 }
 
 void TClient::SetCarPosition(int Ident, const std::string& Data) {
-    // ugly but this is c++ so
-    VehiclePosition->operator[](size_t(Ident)) = Data;
+    std::unique_lock lock(mVehiclePositionMutex);
+    mVehiclePosition[size_t(Ident)] = Data;
 }
 
 std::string TClient::GetCarData(int Ident) {
     { // lock
-        auto Lock = VehicleData.synchronize();
-        for (auto& v : *Lock) {
+        std::unique_lock lock(mVehicleDataMutex);
+        for (auto& v : mVehicleData) {
             if (v.ID() == Ident) {
                 return v.Data();
             }
@@ -93,8 +91,8 @@ std::string TClient::GetCarData(int Ident) {
 
 void TClient::SetCarData(int Ident, const std::string& Data) {
     { // lock
-        auto Lock = VehicleData.synchronize();
-        for (auto& v : *Lock) {
+        std::unique_lock lock(mVehicleDataMutex);
+        for (auto& v : mVehicleData) {
             if (v.ID() == Ident) {
                 v.SetData(Data);
                 return;
@@ -105,7 +103,7 @@ void TClient::SetCarData(int Ident, const std::string& Data) {
 }
 
 int TClient::GetCarCount() const {
-    return int(VehicleData->size());
+    return int(mVehicleData.size());
 }
 
 TServer& TClient::Server() const {
@@ -113,42 +111,45 @@ TServer& TClient::Server() const {
 }
 
 void TClient::EnqueuePacket(const std::vector<uint8_t>& Packet) {
-    MissedPacketsQueue->push(Packet);
+    std::unique_lock Lock(mMissedPacketsMutex);
+    mPacketsSync.push(Packet);
 }
 
 TClient::TClient(TServer& Server, ip::tcp::socket&& Socket)
-    : TCPSocket(std::move(Socket))
-    , DownSocket(ip::tcp::socket(Server.IoCtx()))
-    , LastPingTime(std::chrono::high_resolution_clock::now())
-    , mServer(Server) {
+    : mServer(Server)
+    , mSocket(std::move(Socket))
+    , mDownSocket(ip::tcp::socket(Server.IoCtx()))
+    , mLastPingTime(std::chrono::high_resolution_clock::now()) {
 }
 
 TClient::~TClient() {
-    beammp_debugf("client destroyed: {} ('{}')", ID.get(), Name.get());
+    beammp_debugf("client destroyed: {} ('{}')", this->GetID(), this->GetName());
 }
 
 void TClient::UpdatePingTime() {
-    LastPingTime = std::chrono::high_resolution_clock::now();
+    mLastPingTime = std::chrono::high_resolution_clock::now();
 }
 int TClient::SecondsSinceLastPing() {
     auto seconds = std::chrono::duration_cast<std::chrono::seconds>(
-        std::chrono::high_resolution_clock::now() - LastPingTime.get())
+        std::chrono::high_resolution_clock::now() - mLastPingTime)
                        .count();
     return int(seconds);
 }
 
-std::optional<std::shared_ptr<TClient>> GetClient(TServer& Server, int ID) {
-    std::optional<std::shared_ptr<TClient>> MaybeClient { std::nullopt };
-    Server.ForEachClient([ID, &MaybeClient](const auto& Client) -> bool {
-        if (Client->ID.get() == ID) {
-            MaybeClient = Client;
-            return false;
+std::optional<std::weak_ptr<TClient>> GetClient(TServer& Server, int ID) {
+    std::optional<std::weak_ptr<TClient>> MaybeClient { std::nullopt };
+    Server.ForEachClient([&](std::weak_ptr<TClient> CPtr) -> bool {
+        ReadLock Lock(Server.GetClientMutex());
+        if (!CPtr.expired()) {
+            auto C = CPtr.lock();
+            if (C->GetID() == ID) {
+                MaybeClient = CPtr;
+                return false;
+            }
+        } else {
+            beammp_debugf("Found an expired client while looking for id {}", ID);
         }
         return true;
     });
     return MaybeClient;
 }
-void TClient::SetIdentifier(const std::string& key, const std::string& value) {
-    // I know this is bad, but what can ya do
-    Identifiers->operator[](key) = value;
-}

src/Common.cpp

@@ -275,6 +275,8 @@ void RegisterThread(const std::string& str) {
     ThreadId = std::to_string(getpid()); // todo: research if 'getpid()' is a valid, posix compliant alternative to 'gettid()'
 #elif defined(BEAMMP_LINUX)
     ThreadId = std::to_string(gettid());
+#elif defined(BEAMMP_FREEBSD)
+    ThreadId = std::to_string(getpid());
 #endif
     if (Application::Settings.DebugModeEnabled) {
         std::ofstream ThreadFile(".Threads.log", std::ios::app);

src/Compat.cpp

@@ -41,7 +41,9 @@ TEST_CASE("init and reset termios") {
         CHECK_EQ(current.c_iflag, original.c_iflag);
         CHECK_EQ(current.c_ispeed, original.c_ispeed);
         CHECK_EQ(current.c_lflag, original.c_lflag);
+#ifndef BEAMMP_FREEBSD // The 'c_line' attribute seems to only exist on Linux, so we need to omit it on other platforms
         CHECK_EQ(current.c_line, original.c_line);
+#endif 
         CHECK_EQ(current.c_oflag, original.c_oflag);
         CHECK_EQ(current.c_ospeed, original.c_ospeed);
     }

src/LuaAPI.cpp

@@ -120,14 +120,14 @@ static inline std::pair<bool, std::string> InternalTriggerClientEvent(int Player
         return { true, "" };
     } else {
         auto MaybeClient = GetClient(LuaAPI::MP::Engine->Server(), PlayerID);
-        if (!MaybeClient) {
+        if (!MaybeClient || MaybeClient.value().expired()) {
             beammp_lua_errorf("TriggerClientEvent invalid Player ID '{}'", PlayerID);
             return { false, "Invalid Player ID" };
         }
-        auto c = MaybeClient.value();
+        auto c = MaybeClient.value().lock();
         if (!LuaAPI::MP::Engine->Network().Respond(*c, StringToVector(Packet), true)) {
             beammp_lua_errorf("Respond failed, dropping client {}", PlayerID);
-            LuaAPI::MP::Engine->Network().Disconnect(*c);
+            LuaAPI::MP::Engine->Network().ClientKick(*c, "Disconnected after failing to receive packets");
             return { false, "Respond failed, dropping client" };
         }
         return { true, "" };
@@ -141,11 +141,11 @@ std::pair<bool, std::string> LuaAPI::MP::TriggerClientEvent(int PlayerID, const
 
 std::pair<bool, std::string> LuaAPI::MP::DropPlayer(int ID, std::optional<std::string> MaybeReason) {
     auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (!MaybeClient) {
+    if (!MaybeClient || MaybeClient.value().expired()) {
         beammp_lua_errorf("Tried to drop client with id {}, who doesn't exist", ID);
         return { false, "Player does not exist" };
     }
-    auto c = MaybeClient.value();
+    auto c = MaybeClient.value().lock();
     LuaAPI::MP::Engine->Network().ClientKick(*c, MaybeReason.value_or("No reason"));
     return { true, "" };
 }
@@ -159,18 +159,17 @@ std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::stri
         Result.first = true;
     } else {
         auto MaybeClient = GetClient(Engine->Server(), ID);
-        if (MaybeClient) {
-            auto c = MaybeClient.value();
-            if (!c->IsSynced) {
+        if (MaybeClient && !MaybeClient.value().expired()) {
+            auto c = MaybeClient.value().lock();
+            if (!c->IsSynced()) {
                 Result.first = false;
                 Result.second = "Player still syncing data";
                 return Result;
             }
-            LogChatMessage("<Server> (to \"" + c->Name.get() + "\")", -1, Message);
+            LogChatMessage("<Server> (to \"" + c->GetName() + "\")", -1, Message);
             if (!Engine->Network().Respond(*c, StringToVector(Packet), true)) {
                 beammp_errorf("Failed to send chat message back to sender (id {}) - did the sender disconnect?", ID);
-                beammp_infof("Disconnecting client {} for failure to receive a chat message (TCP disconnect)", c->Name.get());
-                Engine->Network().Disconnect(c);
+                // TODO: should we return an error here?
             }
             Result.first = true;
         } else {
@@ -186,13 +185,13 @@ std::pair<bool, std::string> LuaAPI::MP::SendChatMessage(int ID, const std::stri
 std::pair<bool, std::string> LuaAPI::MP::RemoveVehicle(int PID, int VID) {
     std::pair<bool, std::string> Result;
     auto MaybeClient = GetClient(Engine->Server(), PID);
-    if (!MaybeClient) {
+    if (!MaybeClient || MaybeClient.value().expired()) {
         beammp_lua_error("RemoveVehicle invalid Player ID");
         Result.first = false;
         Result.second = "Invalid Player ID";
         return Result;
     }
-    auto c = MaybeClient.value();
+    auto c = MaybeClient.value().lock();
     if (!c->GetCarData(VID).empty()) {
         std::string Destroy = "Od:" + std::to_string(PID) + "-" + std::to_string(VID);
         Engine->Network().SendToAll(nullptr, StringToVector(Destroy), true, true);
@@ -275,8 +274,8 @@ void LuaAPI::MP::Sleep(size_t Ms) {
 
 bool LuaAPI::MP::IsPlayerConnected(int ID) {
     auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (MaybeClient) {
-        return MaybeClient.value()->IsConnected.get();
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->IsConnected();
     } else {
         return false;
     }
@@ -284,8 +283,8 @@ bool LuaAPI::MP::IsPlayerConnected(int ID) {
 
 bool LuaAPI::MP::IsPlayerGuest(int ID) {
     auto MaybeClient = GetClient(Engine->Server(), ID);
-    if (MaybeClient) {
-        return MaybeClient.value()->IsGuest.get();
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->IsGuest();
     } else {
         return false;
     }

src/TConsole.cpp

@@ -266,12 +266,15 @@ void TConsole::Command_Kick(const std::string&, const std::vector<std::string>&
         std::for_each(Name2.begin(), Name2.end(), [](char& c) { c = char(std::tolower(char(c))); });
         return StringStartsWith(Name1, Name2) || StringStartsWith(Name2, Name1);
     };
-    mLuaEngine->Server().ForEachClient([&](const std::shared_ptr<TClient>& Client) -> bool {
-            if (NameCompare(Client->Name.get(), Name)) {
-                mLuaEngine->Network().ClientKick(*Client, Reason);
+    mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            if (NameCompare(locked->GetName(), Name)) {
+                mLuaEngine->Network().ClientKick(*locked, Reason);
                 Kicked = true;
                 return false;
             }
+        }
         return true;
     });
     if (!Kicked) {
@@ -361,10 +364,13 @@ void TConsole::Command_List(const std::string&, const std::vector<std::string>&
     } else {
         std::stringstream ss;
         ss << std::left << std::setw(25) << "Name" << std::setw(6) << "ID" << std::setw(6) << "Cars" << std::endl;
-        mLuaEngine->Server().ForEachClient([&](const std::shared_ptr<TClient>& Client) -> bool {
-            ss << std::left << std::setw(25) << Client->Name.get()
-               << std::setw(6) << Client->ID.get()
-               << std::setw(6) << Client->GetCarCount() << "\n";
+        mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+            if (!Client.expired()) {
+                auto locked = Client.lock();
+                ss << std::left << std::setw(25) << locked->GetName()
+                   << std::setw(6) << locked->GetID()
+                   << std::setw(6) << locked->GetCarCount() << "\n";
+            }
             return true;
         });
         auto Str = ss.str();
@@ -385,15 +391,18 @@ void TConsole::Command_Status(const std::string&, const std::vector<std::string>
     size_t SyncingCount = 0;
     size_t MissedPacketQueueSum = 0;
     int LargestSecondsSinceLastPing = 0;
-    mLuaEngine->Server().ForEachClient([&](std::shared_ptr<TClient> Client) -> bool {
-        CarCount += size_t(Client->GetCarCount());
-        ConnectedCount += Client->IsConnected ? 1 : 0;
-        GuestCount += Client->IsGuest ? 1 : 0;
-        SyncedCount += Client->IsSynced ? 1 : 0;
-        SyncingCount += Client->IsSyncing ? 1 : 0;
-        MissedPacketQueueSum += Client->MissedPacketsQueue->size();
-        if (Client->SecondsSinceLastPing() < LargestSecondsSinceLastPing) {
-            LargestSecondsSinceLastPing = Client->SecondsSinceLastPing();
+    mLuaEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto Locked = Client.lock();
+            CarCount += Locked->GetCarCount();
+            ConnectedCount += Locked->IsConnected() ? 1 : 0;
+            GuestCount += Locked->IsGuest() ? 1 : 0;
+            SyncedCount += Locked->IsSynced() ? 1 : 0;
+            SyncingCount += Locked->IsSyncing() ? 1 : 0;
+            MissedPacketQueueSum += Locked->MissedPacketQueueSize();
+            if (Locked->SecondsSinceLastPing() < LargestSecondsSinceLastPing) {
+                LargestSecondsSinceLastPing = Locked->SecondsSinceLastPing();
+            }
         }
         return true;
     });

src/THeartbeatThread.cpp

@@ -153,8 +153,11 @@ THeartbeatThread::THeartbeatThread(TResourceManager& ResourceManager, TServer& S
 }
 std::string THeartbeatThread::GetPlayers() {
     std::string Return;
-    mServer.ForEachClient([&](const std::shared_ptr<TClient>& ClientPtr) -> bool {
-        Return += ClientPtr->Name.get() + ";";
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        ReadLock Lock(mServer.GetClientMutex());
+        if (!ClientPtr.expired()) {
+            Return += ClientPtr.lock()->GetName() + ";";
+        }
         return true;
     });
     return Return;

src/TLuaEngine.cpp

@@ -480,13 +480,13 @@ sol::table TLuaEngine::StateThreadData::Lua_TriggerLocalEvent(const std::string&
 
 sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
     auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient) {
-        auto IDs = MaybeClient.value()->Identifiers.synchronize();
-        if (IDs->empty()) {
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto IDs = MaybeClient.value().lock()->GetIdentifiers();
+        if (IDs.empty()) {
             return sol::lua_nil;
         }
         sol::table Result = mStateView.create_table();
-        for (const auto& Pair : *IDs) {
+        for (const auto& Pair : IDs) {
             Result[Pair.first] = Pair.second;
         }
         return Result;
@@ -497,8 +497,11 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayerIdentifiers(int ID) {
 
 sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
     sol::table Result = mStateView.create_table();
-    mEngine->Server().ForEachClient([&](const std::shared_ptr<TClient>& Client) -> bool {
-        Result[Client->ID.get()] = Client->Name.get();
+    mEngine->Server().ForEachClient([&](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            Result[locked->GetID()] = locked->GetName();
+        }
         return true;
     });
     return Result;
@@ -506,10 +509,13 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayers() {
 
 int TLuaEngine::StateThreadData::Lua_GetPlayerIDByName(const std::string& Name) {
     int Id = -1;
-    mEngine->mServer->ForEachClient([&Id, &Name](const std::shared_ptr<TClient>& Client) -> bool {
-        if (Client->Name.get() == Name) {
-            Id = Client->ID.get();
-            return false;
+    mEngine->mServer->ForEachClient([&Id, &Name](std::weak_ptr<TClient> Client) -> bool {
+        if (!Client.expired()) {
+            auto locked = Client.lock();
+            if (locked->GetName() == Name) {
+                Id = locked->GetID();
+                return false;
+            }
         }
         return true;
     });
@@ -544,8 +550,8 @@ sol::table TLuaEngine::StateThreadData::Lua_FS_ListDirectories(const std::string
 
 std::string TLuaEngine::StateThreadData::Lua_GetPlayerName(int ID) {
     auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient) {
-        return MaybeClient.value()->Name.get();
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        return MaybeClient.value().lock()->GetName();
     } else {
         return "";
     }
@@ -553,15 +559,19 @@ std::string TLuaEngine::StateThreadData::Lua_GetPlayerName(int ID) {
 
 sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {
     auto MaybeClient = GetClient(mEngine->Server(), ID);
-    if (MaybeClient) {
-        auto Client = MaybeClient.value();
-        auto VehicleData = Client->VehicleData.synchronize();
-        if (VehicleData->empty()) {
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto Client = MaybeClient.value().lock();
+        TClient::TSetOfVehicleData VehicleData;
+        { // Vehicle Data Lock Scope
+            auto LockedData = Client->GetAllCars();
+            VehicleData = *LockedData.VehicleData;
+        } // End Vehicle Data Lock Scope
+        if (VehicleData.empty()) {
             return sol::lua_nil;
         }
         sol::state_view StateView(mState);
         sol::table Result = StateView.create_table();
-        for (const auto& v : *VehicleData) {
+        for (const auto& v : VehicleData) {
             Result[v.ID()] = v.Data().substr(3);
         }
         return Result;
@@ -572,8 +582,8 @@ sol::table TLuaEngine::StateThreadData::Lua_GetPlayerVehicles(int ID) {
 std::pair<sol::table, std::string> TLuaEngine::StateThreadData::Lua_GetPositionRaw(int PID, int VID) {
     std::pair<sol::table, std::string> Result;
     auto MaybeClient = GetClient(mEngine->Server(), PID);
-    if (MaybeClient) {
-        auto Client = MaybeClient.value();
+    if (MaybeClient && !MaybeClient.value().expired()) {
+        auto Client = MaybeClient.value().lock();
         std::string VehiclePos = Client->GetCarPositionRaw(VID);
 
         if (VehiclePos.empty()) {
@@ -1073,7 +1083,7 @@ void TLuaResult::MarkAsReady() {
 void TLuaResult::WaitUntilReady() {
     std::unique_lock readyLock(*this->ReadyMutex);
     // wait if not ready yet
-    if (!this->Ready)
+    if(!this->Ready)
         this->ReadyCondition->wait(readyLock);
 }
 

src/TNetwork.cpp

@@ -9,7 +9,6 @@
 #include <array>
 #include <boost/asio/ip/address.hpp>
 #include <boost/asio/ip/address_v4.hpp>
-#include <boost/thread/synchronized_value.hpp>
 #include <cstring>
 
 typedef boost::asio::detail::socket_option::integer<SOL_SOCKET, SO_RCVTIMEO> rcv_timeout_option;
@@ -36,8 +35,10 @@ TNetwork::TNetwork(TServer& Server, TPPSMonitor& PPSMonitor, TResourceManager& R
     Application::SetSubsystemStatus("UDPNetwork", Application::Status::Starting);
     Application::RegisterShutdownHandler([&] {
         beammp_debug("Kicking all players due to shutdown");
-        Server.ForEachClient([&](std::shared_ptr<TClient> Client) -> bool {
-            ClientKick(*Client, "Server shutdown");
+        Server.ForEachClient([&](std::weak_ptr<TClient> client) -> bool {
+            if (!client.expired()) {
+                ClientKick(*client.lock(), "Server shutdown");
+            }
             return true;
         });
     });
@@ -86,13 +87,23 @@ void TNetwork::UDPServerMain() {
             if (Data.empty() || Pos > Data.begin() + 2)
                 continue;
             uint8_t ID = uint8_t(Data.at(0)) - 1;
-            mServer.ForEachClient([&](std::shared_ptr<TClient> Client) -> bool {
-                if (Client->ID == ID) {
-                    Client->UDPAddress = client;
-                    Client->IsConnected = true;
-                    Data.erase(Data.begin(), Data.begin() + 2);
-                    mServer.GlobalParser(Client, std::move(Data), mPPSMonitor, *this);
+            mServer.ForEachClient([&](std::weak_ptr<TClient> ClientPtr) -> bool {
+                std::shared_ptr<TClient> Client;
+                {
+                    ReadLock Lock(mServer.GetClientMutex());
+                    if (!ClientPtr.expired()) {
+                        Client = ClientPtr.lock();
+                    } else
+                        return true;
                 }
+
+                if (Client->GetID() == ID) {
+                    Client->SetUDPAddr(client);
+                    Client->SetIsConnected(true);
+                    Data.erase(Data.begin(), Data.begin() + 2);
+                    mServer.GlobalParser(ClientPtr, std::move(Data), mPPSMonitor, *this);
+                }
+
                 return true;
             });
         } catch (const std::exception& e) {
@@ -180,8 +191,8 @@ void TNetwork::Identify(TConnection&& RawConnection) {
         } else {
             beammp_errorf("Invalid code got in Identify: '{}'", Code);
         }
-    } catch (const std::exception& e) {
-        beammp_errorf("Error during handling of code {}->client left in invalid state, closing socket", Code);
+    } catch(const std::exception& e) {
+        beammp_errorf("Error during handling of code {} - client left in invalid state, closing socket", Code);
         boost::system::error_code ec;
         RawConnection.Socket.shutdown(socket_base::shutdown_both, ec);
         if (ec) {
@@ -204,11 +215,16 @@ void TNetwork::HandleDownload(TConnection&& Conn) {
         return;
     }
     auto ID = uint8_t(D);
-    auto Client = GetClient(mServer, ID);
-    if (Client.has_value()) {
-        auto New = Sync<ip::tcp::socket>(std::move(Conn.Socket));
-        Client.value()->DownSocket.swap(New);
-    }
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        ReadLock Lock(mServer.GetClientMutex());
+        if (!ClientPtr.expired()) {
+            auto c = ClientPtr.lock();
+            if (c->GetID() == ID) {
+                c->SetDownSock(std::move(Conn.Socket));
+            }
+        }
+        return true;
+    });
 }
 
 std::string HashPassword(const std::string& str) {
@@ -244,9 +260,8 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
         return nullptr;
     }
 
-    if (!TCPSend(*Client, StringToVector("A"))) { // changed to A for Accepted version
-        Disconnect(Client);
-        return nullptr;
+    if (!TCPSend(*Client, StringToVector("A"))) { //changed to A for Accepted version
+        // TODO: handle
     }
 
     Data = TCPRcv(*Client);
@@ -258,8 +273,8 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
 
     std::string key(reinterpret_cast<const char*>(Data.data()), Data.size());
 
-    nlohmann::json AuthReq {};
-    std::string AuthResStr {};
+    nlohmann::json AuthReq{};
+    std::string AuthResStr{};
     try {
         AuthReq = nlohmann::json {
             { "key", key }
@@ -283,7 +298,7 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
 
             Client->SetName(AuthRes["username"]);
             Client->SetRoles(AuthRes["roles"]);
-            Client->IsGuest = AuthRes["guest"];
+            Client->SetIsGuest(AuthRes["guest"]);
             for (const auto& ID : AuthRes["identifiers"]) {
                 auto Raw = std::string(ID);
                 auto SepIndex = Raw.find(':');
@@ -301,33 +316,41 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
         return nullptr;
     }
 
-    if (!Application::Settings.Password.empty()) { // ask password
-        if (!TCPSend(*Client, StringToVector("S"))) {
-            Disconnect(Client);
-            return {};
+    if(!Application::Settings.Password.empty()) { // ask password
+        if(!TCPSend(*Client, StringToVector("S"))) {
+            // TODO: handle
         }
         beammp_info("Waiting for password");
         Data = TCPRcv(*Client);
         std::string Pass = std::string(reinterpret_cast<const char*>(Data.data()), Data.size());
-        if (Pass != HashPassword(Application::Settings.Password)) {
-            beammp_debug(Client->Name.get() + " attempted to connect with a wrong password");
+        if(Pass != HashPassword(Application::Settings.Password)) {
+            beammp_debug(Client->GetName() + " attempted to connect with a wrong password");
             ClientKick(*Client, "Wrong password!");
             return {};
         } else {
-            beammp_debug(Client->Name.get() + " used the correct password");
+            beammp_debug(Client->GetName() + " used the correct password");
         }
     }
 
-    beammp_debug("Name-> " + Client->Name.get() + ", Guest-> " + std::to_string(Client->IsGuest.get()) + ", Roles-> " + Client->Role.get());
-    mServer.ForEachClient([&](const std::shared_ptr<TClient>& Cl) -> bool {
-        if (Cl->Name.get() == Client->Name.get() && Cl->IsGuest == Client->IsGuest) {
-            Disconnect(Cl);
+    beammp_debug("Name -> " + Client->GetName() + ", Guest -> " + std::to_string(Client->IsGuest()) + ", Roles -> " + Client->GetRoles());
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        std::shared_ptr<TClient> Cl;
+        {
+            ReadLock Lock(mServer.GetClientMutex());
+            if (!ClientPtr.expired()) {
+                Cl = ClientPtr.lock();
+            } else
+                return true;
+        }
+        if (Cl->GetName() == Client->GetName() && Cl->IsGuest() == Client->IsGuest()) {
+            Cl->Disconnect("Stale Client (not a real player)");
             return false;
         }
+
         return true;
     });
 
-    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerAuth", "", Client->Name.get(), Client->Role.get(), Client->IsGuest.get(), Client->Identifiers.get());
+    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerAuth", "", Client->GetName(), Client->GetRoles(), Client->IsGuest(), Client->GetIdentifiers());
     TLuaEngine::WaitForAll(Futures);
     bool NotAllowed = std::any_of(Futures.begin(), Futures.end(),
         [](const std::shared_ptr<TLuaResult>& Result) {
@@ -354,13 +377,7 @@ std::shared_ptr<TClient> TNetwork::Authentication(TConnection&& RawConnection) {
     if (mServer.ClientCount() < size_t(Application::Settings.MaxPlayers)) {
         beammp_info("Identification success");
         mServer.InsertClient(Client);
-        try {
-            TCPClient(Client);
-        } catch (const std::exception& e) {
-            beammp_infof("Client {} disconnected: {}", Client->ID.get(), e.what());
-            Disconnect(Client);
-            return {};
-        }
+        TCPClient(Client);
     } else {
         ClientKick(*Client, "Server full!");
     }
@@ -375,7 +392,7 @@ std::shared_ptr<TClient> TNetwork::CreateClient(ip::tcp::socket&& TCPSock) {
 
 bool TNetwork::TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync) {
     if (!IsSync) {
-        if (c.IsSyncing) {
+        if (c.IsSyncing()) {
             if (!Data.empty()) {
                 if (Data.at(0) == 'O' || Data.at(0) == 'A' || Data.at(0) == 'C' || Data.at(0) == 'E') {
                     c.EnqueuePacket(Data);
@@ -385,6 +402,8 @@ bool TNetwork::TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync
         }
     }
 
+    auto& Sock = c.GetTCPSock();
+
     /*
      * our TCP protocol sends a header of 4 bytes, followed by the data.
      *
@@ -399,10 +418,10 @@ bool TNetwork::TCPSend(TClient& c, const std::vector<uint8_t>& Data, bool IsSync
     std::memcpy(ToSend.data(), &Size, sizeof(Size));
     std::memcpy(ToSend.data() + sizeof(Size), Data.data(), Data.size());
     boost::system::error_code ec;
-    write(*c.TCPSocket.synchronize(), buffer(ToSend), ec);
+    write(Sock, buffer(ToSend), ec);
     if (ec) {
         beammp_debugf("write(): {}", ec.message());
-        Disconnect(c);
+        c.Disconnect("write() failed");
         return false;
     }
     c.UpdatePingTime();
@@ -416,10 +435,11 @@ std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
     }
 
     int32_t Header {};
+    auto& Sock = c.GetTCPSock();
 
     boost::system::error_code ec;
     std::array<uint8_t, sizeof(Header)> HeaderData;
-    read(*c.TCPSocket.synchronize(), buffer(HeaderData), ec);
+    read(Sock, buffer(HeaderData), ec);
     if (ec) {
         // TODO: handle this case (read failed)
         beammp_debugf("TCPRcv: Reading header failed: {}", ec.message());
@@ -428,8 +448,8 @@ std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
     Header = *reinterpret_cast<int32_t*>(HeaderData.data());
 
     if (Header < 0) {
-        ClientKick(c, "Invalid packet->header negative");
-        beammp_errorf("Client {} send negative TCP header, ignoring packet", c.ID.get());
+        ClientKick(c, "Invalid packet - header negative");
+        beammp_errorf("Client {} send negative TCP header, ignoring packet", c.GetID());
         return {};
     }
 
@@ -439,10 +459,10 @@ std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
         Data.resize(Header);
     } else {
         ClientKick(c, "Header size limit exceeded");
-        beammp_warn("Client " + c.Name.get() + " (" + std::to_string(c.ID.get()) + ") sent header of >100MB->assuming malicious intent and disconnecting the client.");
+        beammp_warn("Client " + c.GetName() + " (" + std::to_string(c.GetID()) + ") sent header of >100MB - assuming malicious intent and disconnecting the client.");
         return {};
     }
-    auto N = read(*c.TCPSocket.synchronize(), buffer(Data), ec);
+    auto N = read(Sock, buffer(Data), ec);
     if (ec) {
         // TODO: handle this case properly
         beammp_debugf("TCPRcv: Reading data failed: {}", ec.message());
@@ -465,30 +485,37 @@ std::vector<uint8_t> TNetwork::TCPRcv(TClient& c) {
 void TNetwork::ClientKick(TClient& c, const std::string& R) {
     beammp_info("Client kicked: " + R);
     if (!TCPSend(c, StringToVector("K" + R))) {
-        beammp_debugf("tried to kick player '{}' (id {}), but was already disconnected", c.Name.get(), c.ID.get());
+        beammp_debugf("tried to kick player '{}' (id {}), but was already disconnected", c.GetName(), c.GetID());
     }
-    Disconnect(c);
+    c.Disconnect("Kicked");
 }
 
-void TNetwork::Looper(const std::shared_ptr<TClient>& Client) {
+void TNetwork::Looper(const std::weak_ptr<TClient>& c) {
     RegisterThreadAuto();
-    while (!Client->IsDisconnected()) {
-        if (!Client->IsSyncing.get() && Client->IsSynced.get() && Client->MissedPacketsQueue->size() != 0) {
-            while (Client->MissedPacketsQueue->size() > 0) {
+    while (!c.expired()) {
+        auto Client = c.lock();
+        if (Client->IsDisconnected()) {
+            beammp_debug("client is disconnected, breaking client loop");
+            break;
+        }
+        if (!Client->IsSyncing() && Client->IsSynced() && Client->MissedPacketQueueSize() != 0) {
+            // debug("sending " + std::to_string(Client->MissedPacketQueueSize()) + " queued packets");
+            while (Client->MissedPacketQueueSize() > 0) {
                 std::vector<uint8_t> QData {};
                 { // locked context
-                    auto Lock = Client->MissedPacketsQueue;
-                    if (Lock->size() <= 0) {
+                    std::unique_lock lock(Client->MissedPacketQueueMutex());
+                    if (Client->MissedPacketQueueSize() <= 0) {
                         break;
                     }
-                    QData = Lock->front();
-                    Lock->pop();
+                    QData = Client->MissedPacketQueue().front();
+                    Client->MissedPacketQueue().pop();
                 } // end locked context
+                // beammp_debug("sending a missed packet: " + QData);
                 if (!TCPSend(*Client, QData, true)) {
-                    Disconnect(Client);
-                    auto Lock = Client->MissedPacketsQueue;
-                    while (!Lock->empty()) {
-                        Lock->pop();
+                    Client->Disconnect("Failed to TCPSend while clearing the missed packet queue");
+                    std::unique_lock lock(Client->MissedPacketQueueMutex());
+                    while (!Client->MissedPacketQueue().empty()) {
+                        Client->MissedPacketQueue().pop();
                     }
                     break;
                 }
@@ -499,22 +526,30 @@ void TNetwork::Looper(const std::shared_ptr<TClient>& Client) {
     }
 }
 
-void TNetwork::TCPClient(const std::shared_ptr<TClient>& c) {
+void TNetwork::TCPClient(const std::weak_ptr<TClient>& c) {
+    // TODO: the c.expired() might cause issues here, remove if you end up here with your debugger
+    if (c.expired() || !c.lock()->GetTCPSock().is_open()) {
+        mServer.RemoveClient(c);
+        return;
+    }
     OnConnect(c);
-    RegisterThread("(" + std::to_string(c->ID.get()) + ") \"" + c->Name.get() + "\"");
+    RegisterThread("(" + std::to_string(c.lock()->GetID()) + ") \"" + c.lock()->GetName() + "\"");
 
     std::thread QueueSync(&TNetwork::Looper, this, c);
 
     while (true) {
-        if (c->IsDisconnected()) {
+        if (c.expired())
+            break;
+        auto Client = c.lock();
+        if (Client->IsDisconnected()) {
             beammp_debug("client status < 0, breaking client loop");
             break;
         }
 
-        auto res = TCPRcv(*c);
+        auto res = TCPRcv(*Client);
         if (res.empty()) {
             beammp_debug("TCPRcv empty");
-            Disconnect(c);
+            Client->Disconnect("TCPRcv failed");
             break;
         }
         mServer.GlobalParser(c, std::move(res), mPPSMonitor, *this);
@@ -523,14 +558,22 @@ void TNetwork::TCPClient(const std::shared_ptr<TClient>& c) {
     if (QueueSync.joinable())
         QueueSync.join();
 
-    Disconnect(c);
+    if (!c.expired()) {
+        auto Client = c.lock();
+        OnDisconnect(c);
+    } else {
+        beammp_warn("client expired in TCPClient, should never happen");
+    }
 }
 
 void TNetwork::UpdatePlayer(TClient& Client) {
     std::string Packet = ("Ss") + std::to_string(mServer.ClientCount()) + "/" + std::to_string(Application::Settings.MaxPlayers) + ":";
-    mServer.ForEachClient([&](const std::shared_ptr<TClient>& Client) -> bool {
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
         ReadLock Lock(mServer.GetClientMutex());
-        Packet += Client->Name.get() + ",";
+        if (!ClientPtr.expired()) {
+            auto c = ClientPtr.lock();
+            Packet += c->GetName() + ",";
+        }
         return true;
     });
     Packet = Packet.substr(0, Packet.length() - 1);
@@ -538,66 +581,74 @@ void TNetwork::UpdatePlayer(TClient& Client) {
     //(void)Respond(Client, Packet, true);
 }
 
-void TNetwork::Disconnect(const std::weak_ptr<TClient>& ClientPtr) {
-    // this is how one checks that the ClientPtr is not empty (as opposed to expired)
-    if (ClientPtr.owner_before(std::weak_ptr<TClient> {})) {
-        return;
-    }
+void TNetwork::OnDisconnect(const std::weak_ptr<TClient>& ClientPtr) {
     std::shared_ptr<TClient> LockedClientPtr { nullptr };
     try {
         LockedClientPtr = ClientPtr.lock();
     } catch (const std::exception&) {
-        beammp_warn("Client expired in CloseSockets, this is unexpected");
+        beammp_warn("Client expired in OnDisconnect, this is unexpected");
         return;
     }
     beammp_assert(LockedClientPtr != nullptr);
     TClient& c = *LockedClientPtr;
-    Disconnect(c);
-}
-void TNetwork::Disconnect(TClient& Client) {
-    beammp_info(Client.Name.get() + (" Connection Terminated"));
+    beammp_info(c.GetName() + (" Connection Terminated"));
     std::string Packet;
-    {
-        auto Locked = Client.VehicleData.synchronize();
-        for (auto& v : *Locked) {
-            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", Client.ID.get(), v.ID()));
-            Packet = "Od:" + std::to_string(Client.ID.get()) + "-" + std::to_string(v.ID());
-            SendToAll(&Client, StringToVector(Packet), false, true);
-        }
+    TClient::TSetOfVehicleData VehicleData;
+    { // Vehicle Data Lock Scope
+        auto LockedData = c.GetAllCars();
+        VehicleData = *LockedData.VehicleData;
+    } // End Vehicle Data Lock Scope
+    for (auto& v : VehicleData) {
+        Packet = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(v.ID());
+        SendToAll(&c, StringToVector(Packet), false, true);
     }
-    Packet = ("L") + Client.Name.get() + (" left the server!");
-    SendToAll(&Client, StringToVector(Packet), false, true);
+    Packet = ("L") + c.GetName() + (" left the server!");
+    SendToAll(&c, StringToVector(Packet), false, true);
     Packet.clear();
-    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerDisconnect", "", Client.ID.get());
-    TLuaEngine::WaitForAll(Futures);
-    Client.CloseSockets("Normal disconnect");
-    mServer.RemoveClient(Client);
+    auto Futures = LuaAPI::MP::Engine->TriggerEvent("onPlayerDisconnect", "", c.GetID());
+    LuaAPI::MP::Engine->WaitForAll(Futures);
+    c.Disconnect("Already Disconnected (OnDisconnect)");
+    mServer.RemoveClient(ClientPtr);
 }
-void TNetwork::Disconnect(const std::shared_ptr<TClient>& ClientPtr) {
-    if (ClientPtr == nullptr) {
-        return;
-    }
-    Disconnect(*ClientPtr);
+
+int TNetwork::OpenID() {
+    int ID = 0;
+    bool found;
+    do {
+        found = true;
+        mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+            ReadLock Lock(mServer.GetClientMutex());
+            if (!ClientPtr.expired()) {
+                auto c = ClientPtr.lock();
+                if (c->GetID() == ID) {
+                    found = false;
+                    ID++;
+                }
+            }
+            return true;
+        });
+    } while (!found);
+    return ID;
 }
 
 void TNetwork::OnConnect(const std::weak_ptr<TClient>& c) {
     beammp_assert(!c.expired());
     beammp_info("Client connected");
     auto LockedClient = c.lock();
-    mServer.ClaimFreeIDFor(*LockedClient);
-    beammp_info("Assigned ID " + std::to_string(LockedClient->ID.get()) + " to " + LockedClient->Name.get());
-    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerConnecting", "", LockedClient->ID.get()));
+    LockedClient->SetID(OpenID());
+    beammp_info("Assigned ID " + std::to_string(LockedClient->GetID()) + " to " + LockedClient->GetName());
+    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerConnecting", "", LockedClient->GetID()));
     SyncResources(*LockedClient);
     if (LockedClient->IsDisconnected())
         return;
     (void)Respond(*LockedClient, StringToVector("M" + Application::Settings.MapName), true); // Send the Map on connect
-    beammp_info(LockedClient->Name.get() + " : Connected");
-    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoining", "", LockedClient->ID.get()));
+    beammp_info(LockedClient->GetName() + " : Connected");
+    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoining", "", LockedClient->GetID()));
 }
 
 void TNetwork::SyncResources(TClient& c) {
-    if (!TCPSend(c, StringToVector("P" + std::to_string(c.ID.get())))) {
-        throw std::runtime_error("Failed to send 'P' to client");
+    if (!TCPSend(c, StringToVector("P" + std::to_string(c.GetID())))) {
+        // TODO handle
     }
     std::vector<uint8_t> Data;
     while (!c.IsDisconnected()) {
@@ -629,7 +680,7 @@ void TNetwork::Parse(TClient& c, const std::vector<uint8_t>& Packet) {
             if (ToSend.empty())
                 ToSend = "-";
             if (!TCPSend(c, StringToVector(ToSend))) {
-                throw std::runtime_error("Failed to send packet to client");
+                // TODO: error
             }
         }
         return;
@@ -639,12 +690,11 @@ void TNetwork::Parse(TClient& c, const std::vector<uint8_t>& Packet) {
 }
 
 void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
-    beammp_info(c.Name.get() + " requesting : " + UnsafeName.substr(UnsafeName.find_last_of('/')));
+    beammp_info(c.GetName() + " requesting : " + UnsafeName.substr(UnsafeName.find_last_of('/')));
 
     if (!fs::path(UnsafeName).has_filename()) {
         if (!TCPSend(c, StringToVector("CO"))) {
-            Disconnect(c);
-            return;
+            // TODO: handle
         }
         beammp_warn("File " + UnsafeName + " is not a file!");
         return;
@@ -654,29 +704,27 @@ void TNetwork::SendFile(TClient& c, const std::string& UnsafeName) {
 
     if (!std::filesystem::exists(FileName)) {
         if (!TCPSend(c, StringToVector("CO"))) {
-            Disconnect(c);
-            return;
+            // TODO: handle
         }
         beammp_warn("File " + UnsafeName + " could not be accessed!");
         return;
     }
 
     if (!TCPSend(c, StringToVector("AG"))) {
-        Disconnect(c);
-        return;
+        // TODO: handle
     }
 
     /// Wait for connections
     int T = 0;
-    while (!c.DownSocket->is_open() && T < 50) {
+    while (!c.GetDownSock().is_open() && T < 50) {
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
         T++;
     }
 
-    if (!c.DownSocket->is_open()) {
+    if (!c.GetDownSock().is_open()) {
         beammp_error("Client doesn't have a download socket!");
         if (!c.IsDisconnected())
-            Disconnect(c);
+            c.Disconnect("Missing download socket");
         return;
     }
 
@@ -756,54 +804,31 @@ void TNetwork::SplitLoad(TClient& c, size_t Sent, size_t Size, bool D, const std
         Data.resize(Split);
     else
         Data.resize(Size);
-
-    if (D) {
-        auto TCPSock = c.DownSocket.synchronize();
-        while (!c.IsDisconnected() && Sent < Size) {
-            size_t Diff = Size - Sent;
-            if (Diff > Split) {
-                f.seekg(Sent, std::ios_base::beg);
-                f.read(reinterpret_cast<char*>(Data.data()), Split);
-                if (!TCPSendRaw(c, *TCPSock, Data.data(), Split)) {
-                    if (!c.IsDisconnected())
-                        Disconnect(c);
-                    break;
-                }
-                Sent += Split;
-            } else {
-                f.seekg(Sent, std::ios_base::beg);
-                f.read(reinterpret_cast<char*>(Data.data()), Diff);
-                if (!TCPSendRaw(c, *TCPSock, Data.data(), int32_t(Diff))) {
-                    if (!c.IsDisconnected())
-                        Disconnect(c);
-                    break;
-                }
-                Sent += Diff;
+    ip::tcp::socket* TCPSock { nullptr };
+    if (D)
+        TCPSock = &c.GetDownSock();
+    else
+        TCPSock = &c.GetTCPSock();
+    while (!c.IsDisconnected() && Sent < Size) {
+        size_t Diff = Size - Sent;
+        if (Diff > Split) {
+            f.seekg(Sent, std::ios_base::beg);
+            f.read(reinterpret_cast<char*>(Data.data()), Split);
+            if (!TCPSendRaw(c, *TCPSock, Data.data(), Split)) {
+                if (!c.IsDisconnected())
+                    c.Disconnect("TCPSendRaw failed in mod download (1)");
+                break;
             }
-        }
-    } else {
-        auto TCPSock = c.TCPSocket.synchronize();
-        while (!c.IsDisconnected() && Sent < Size) {
-            size_t Diff = Size - Sent;
-            if (Diff > Split) {
-                f.seekg(Sent, std::ios_base::beg);
-                f.read(reinterpret_cast<char*>(Data.data()), Split);
-                if (!TCPSendRaw(c, *TCPSock, Data.data(), Split)) {
-                    if (!c.IsDisconnected())
-                        Disconnect(c);
-                    break;
-                }
-                Sent += Split;
-            } else {
-                f.seekg(Sent, std::ios_base::beg);
-                f.read(reinterpret_cast<char*>(Data.data()), Diff);
-                if (!TCPSendRaw(c, *TCPSock, Data.data(), int32_t(Diff))) {
-                    if (!c.IsDisconnected())
-                        Disconnect(c);
-                    break;
-                }
-                Sent += Diff;
+            Sent += Split;
+        } else {
+            f.seekg(Sent, std::ios_base::beg);
+            f.read(reinterpret_cast<char*>(Data.data()), Diff);
+            if (!TCPSendRaw(c, *TCPSock, Data.data(), int32_t(Diff))) {
+                if (!c.IsDisconnected())
+                    c.Disconnect("TCPSendRaw failed in mod download (2)");
+                break;
             }
+            Sent += Diff;
         }
     }
 }
@@ -844,24 +869,36 @@ bool TNetwork::SyncClient(const std::weak_ptr<TClient>& c) {
         return false;
     }
     auto LockedClient = c.lock();
-    if (LockedClient->IsSynced.get())
+    if (LockedClient->IsSynced())
         return true;
     // Syncing, later set isSynced
     // after syncing is done, we apply all packets they missed
-    if (!Respond(*LockedClient, StringToVector("Sn" + LockedClient->Name.get()), true)) {
+    if (!Respond(*LockedClient, StringToVector("Sn" + LockedClient->GetName()), true)) {
         return false;
     }
     // ignore error
-    (void)SendToAll(LockedClient.get(), StringToVector("JWelcome " + LockedClient->Name.get() + "!"), false, true);
+    (void)SendToAll(LockedClient.get(), StringToVector("JWelcome " + LockedClient->GetName() + "!"), false, true);
 
-    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoin", "", LockedClient->ID.get()));
-    LockedClient->IsSyncing = true;
+    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onPlayerJoin", "", LockedClient->GetID()));
+    LockedClient->SetIsSyncing(true);
     bool Return = false;
     bool res = true;
-    mServer.ForEachClient([&](const std::shared_ptr<TClient>& Client) -> bool {
-        auto VehicleData = Client->VehicleData.synchronize();
-        if (Client != LockedClient) {
-            for (auto& v : *VehicleData) {
+    mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+        std::shared_ptr<TClient> client;
+        {
+            ReadLock Lock(mServer.GetClientMutex());
+            if (!ClientPtr.expired()) {
+                client = ClientPtr.lock();
+            } else
+                return true;
+        }
+        TClient::TSetOfVehicleData VehicleData;
+        { // Vehicle Data Lock Scope
+            auto LockedData = client->GetAllCars();
+            VehicleData = *LockedData.VehicleData;
+        } // End Vehicle Data Lock Scope
+        if (client != LockedClient) {
+            for (auto& v : VehicleData) {
                 if (LockedClient->IsDisconnected()) {
                     Return = true;
                     res = false;
@@ -873,22 +910,32 @@ bool TNetwork::SyncClient(const std::weak_ptr<TClient>& c) {
 
         return true;
     });
-    LockedClient->IsSyncing = false;
+    LockedClient->SetIsSyncing(false);
     if (Return) {
         return res;
     }
-    LockedClient->IsSynced = true;
-    beammp_info(LockedClient->Name.get() + (" is now synced!"));
+    LockedClient->SetIsSynced(true);
+    beammp_info(LockedClient->GetName() + (" is now synced!"));
     return true;
 }
 
 void TNetwork::SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self, bool Rel) {
     if (!Self)
         beammp_assert(c);
-    char C = static_cast<char>(Data.at(0));
-    mServer.ForEachClient([&](const std::shared_ptr<TClient>& Client) -> bool {
+    char C = Data.at(0);
+    bool ret = true;
+    mServer.ForEachClient([&](std::weak_ptr<TClient> ClientPtr) -> bool {
+        std::shared_ptr<TClient> Client;
+        try {
+            ReadLock Lock(mServer.GetClientMutex());
+            Client = ClientPtr.lock();
+        } catch (const std::exception&) {
+            // continue
+            beammp_warn("Client expired, shouldn't happen - if a client disconnected recently, you can ignore this");
+            return true;
+        }
         if (Self || Client.get() != c) {
-            if (Client->IsSynced || Client->IsSyncing) {
+            if (Client->IsSynced() || Client->IsSyncing()) {
                 if (Rel || C == 'W' || C == 'Y' || C == 'V' || C == 'E') {
                     if (C == 'O' || C == 'T' || Data.size() > 1000) {
                         if (Data.size() > 400) {
@@ -898,38 +945,42 @@ void TNetwork::SendToAll(TClient* c, const std::vector<uint8_t>& Data, bool Self
                         } else {
                             Client->EnqueuePacket(Data);
                         }
+                        // ret = SendLarge(*Client, Data);
                     } else {
                         Client->EnqueuePacket(Data);
+                        // ret = TCPSend(*Client, Data);
                     }
                 } else {
-                    if (!UDPSend(*Client, Data)) {
-                        Disconnect(Client);
-                    }
+                    ret = UDPSend(*Client, Data);
                 }
             }
         }
         return true;
     });
+    if (!ret) {
+        // TODO: handle
+    }
+    return;
 }
 
 bool TNetwork::UDPSend(TClient& Client, std::vector<uint8_t> Data) {
-    if (!Client.IsConnected || Client.IsDisconnected()) {
+    if (!Client.IsConnected() || Client.IsDisconnected()) {
         // this can happen if we try to send a packet to a client that is either
         // 1. not yet fully connected, or
         // 2. disconnected and not yet fully removed
         // this is fine can can be ignored :^)
         return true;
     }
-    const auto Addr = Client.UDPAddress;
+    const auto Addr = Client.GetUDPAddr();
     if (Data.size() > 400) {
         CompressProperly(Data);
     }
     boost::system::error_code ec;
-    mUDPSock.send_to(buffer(Data), *Addr, 0, ec);
+    mUDPSock.send_to(buffer(Data), Addr, 0, ec);
     if (ec) {
         beammp_debugf("UDP sendto() failed: {}", ec.message());
         if (!Client.IsDisconnected())
-            Disconnect(Client);
+            Client.Disconnect("UDP send failed");
         return false;
     }
     return true;

src/TPPSMonitor.cpp

@@ -33,14 +33,22 @@ void TPPSMonitor::operator()() {
             Application::SetPPS("-");
             continue;
         }
-        mServer.ForEachClient([&](const std::shared_ptr<TClient>& c) -> bool {
+        mServer.ForEachClient([&](const std::weak_ptr<TClient>& ClientPtr) -> bool {
+            std::shared_ptr<TClient> c;
+            {
+                ReadLock Lock(mServer.GetClientMutex());
+                if (!ClientPtr.expired()) {
+                    c = ClientPtr.lock();
+                } else
+                    return true;
+            }
             if (c->GetCarCount() > 0) {
                 C++;
                 V += c->GetCarCount();
             }
             // kick on "no ping"
             if (c->SecondsSinceLastPing() > (20 * 60)) {
-                beammp_debug("client " + std::string("(") + std::to_string(c->ID.get()) + ")" + c->Name.get() + " timing out: " + std::to_string(c->SecondsSinceLastPing()) + ", pps: " + Application::PPS());
+                beammp_debug("client " + std::string("(") + std::to_string(c->GetID()) + ")" + c->GetName() + " timing out: " + std::to_string(c->SecondsSinceLastPing()) + ", pps: " + Application::PPS());
                 TimedOutClients.push_back(c);
             }
 

src/TServer.cpp

@@ -118,17 +118,7 @@ TServer::TServer(const std::vector<std::string_view>& Arguments) {
     }
     Application::SetSubsystemStatus("Server", Application::Status::Good);
 }
-void TServer::RemoveClient(TClient& Client) {
-    beammp_debug("removing client " + Client.Name.get() + " (" + std::to_string(ClientCount()) + ")");
-    Client.ClearCars();
-    WriteLock Lock(mClientsMutex);
-    // erase all clients whose id matches, and those who have expired
-    std::erase_if(mClients,
-        [&](const std::weak_ptr<TClient>& C) {
-            return C.expired()
-                || C.lock()->ID.get() == Client.ID.get();
-        });
-}
+
 void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
     std::shared_ptr<TClient> LockedClientPtr { nullptr };
     try {
@@ -139,26 +129,14 @@ void TServer::RemoveClient(const std::weak_ptr<TClient>& WeakClientPtr) {
     }
     beammp_assert(LockedClientPtr != nullptr);
     TClient& Client = *LockedClientPtr;
-    RemoveClient(Client);
+    beammp_debug("removing client " + Client.GetName() + " (" + std::to_string(ClientCount()) + ")");
+    // TODO: Send delete packets for all cars
+    Client.ClearCars();
+    WriteLock Lock(mClientsMutex);
+    mClients.erase(WeakClientPtr.lock());
 }
 
-void TServer::ClaimFreeIDFor(TClient& ClientToChange) {
-    ReadLock lock(mClientsMutex);
-    int ID = 0;
-    bool found = true;
-    do {
-        found = true;
-        for (const auto& Client : mClients) {
-            if (Client->ID.get() == ID) {
-                found = false;
-                ++ID;
-            }
-        }
-    } while (!found);
-    ClientToChange.ID = ID;
-}
-
-void TServer::ForEachClient(const std::function<bool(const std::shared_ptr<TClient>&)> Fn) {
+void TServer::ForEachClient(const std::function<bool(std::weak_ptr<TClient>)>& Fn) {
     decltype(mClients) Clients;
     {
         ReadLock lock(mClientsMutex);
@@ -176,7 +154,7 @@ size_t TServer::ClientCount() const {
     return mClients.size();
 }
 
-void TServer::GlobalParser(const std::shared_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
+void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uint8_t>&& Packet, TPPSMonitor& PPSMonitor, TNetwork& Network) {
     constexpr std::string_view ABG = "ABG:";
     if (Packet.size() >= ABG.size() && std::equal(Packet.begin(), Packet.begin() + ABG.size(), ABG.begin(), ABG.end())) {
         Packet.erase(Packet.begin(), Packet.begin() + ABG.size());
@@ -186,6 +164,11 @@ void TServer::GlobalParser(const std::shared_ptr<TClient>& Client, std::vector<u
         return;
     }
 
+    if (Client.expired()) {
+        return;
+    }
+    auto LockedClient = Client.lock();
+
     std::any Res;
     char Code = Packet.at(0);
 
@@ -194,7 +177,7 @@ void TServer::GlobalParser(const std::shared_ptr<TClient>& Client, std::vector<u
     // V to Y
     if (Code <= 89 && Code >= 86) {
         PPSMonitor.IncrementInternalPPS();
-        Network.SendToAll(Client.get(), Packet, false, false);
+        Network.SendToAll(LockedClient.get(), Packet, false, false);
         return;
     }
     switch (Code) {
@@ -204,18 +187,18 @@ void TServer::GlobalParser(const std::shared_ptr<TClient>& Client, std::vector<u
         }
         return;
     case 'p':
-        if (!Network.Respond(*Client, StringToVector("p"), false)) {
+        if (!Network.Respond(*LockedClient, StringToVector("p"), false)) {
             // failed to send
-            Network.Disconnect(Client);
+            LockedClient->Disconnect("Failed to send ping");
         } else {
-            Network.UpdatePlayer(*Client);
+            Network.UpdatePlayer(*LockedClient);
         }
         return;
     case 'O':
         if (Packet.size() > 1000) {
-            beammp_debug(("Received data from: ") + Client->Name.get() + (" Size: ") + std::to_string(Packet.size()));
+            beammp_debug(("Received data from: ") + LockedClient->GetName() + (" Size: ") + std::to_string(Packet.size()));
         }
-        ParseVehicle(*Client, StringPacket, Network);
+        ParseVehicle(*LockedClient, StringPacket, Network);
         return;
     case 'C': {
         if (Packet.size() < 4 || std::find(Packet.begin() + 3, Packet.end(), ':') == Packet.end())
@@ -227,12 +210,12 @@ void TServer::GlobalParser(const std::shared_ptr<TClient>& Client, std::vector<u
             Message = PacketAsString.substr(ColonPos + 2);
         }
         if (Message.empty()) {
-            beammp_debugf("Empty chat message received from '{}' ({}), ignoring it", Client->Name.get(), Client->ID.get());
+            beammp_debugf("Empty chat message received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
             return;
         }
-        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", Client->ID.get(), Client->Name.get(), Message);
+        auto Futures = LuaAPI::MP::Engine->TriggerEvent("onChatMessage", "", LockedClient->GetID(), LockedClient->GetName(), Message);
         TLuaEngine::WaitForAll(Futures);
-        LogChatMessage(Client->Name.get(), Client->ID.get(), PacketAsString.substr(PacketAsString.find(':', 3) + 1));
+        LogChatMessage(LockedClient->GetName(), LockedClient->GetID(), PacketAsString.substr(PacketAsString.find(':', 3) + 1));
         if (std::any_of(Futures.begin(), Futures.end(),
                 [](const std::shared_ptr<TLuaResult>& Elem) {
                     return !Elem->Error
@@ -241,21 +224,21 @@ void TServer::GlobalParser(const std::shared_ptr<TClient>& Client, std::vector<u
                 })) {
             break;
         }
-        std::string SanitizedPacket = fmt::format("C:{}: {}", Client->Name.get(), Message);
+        std::string SanitizedPacket = fmt::format("C:{}: {}", LockedClient->GetName(), Message);
         Network.SendToAll(nullptr, StringToVector(SanitizedPacket), true, true);
         return;
     }
     case 'E':
-        HandleEvent(*Client, StringPacket);
+        HandleEvent(*LockedClient, StringPacket);
         return;
     case 'N':
         beammp_trace("got 'N' packet (" + std::to_string(Packet.size()) + ")");
-        Network.SendToAll(Client.get(), Packet, false, true);
+        Network.SendToAll(LockedClient.get(), Packet, false, true);
         return;
     case 'Z': // position packet
         PPSMonitor.IncrementInternalPPS();
-        Network.SendToAll(Client.get(), Packet, false, false);
-        HandlePosition(*Client, StringPacket);
+        Network.SendToAll(LockedClient.get(), Packet, false, false);
+        HandlePosition(*LockedClient, StringPacket);
         return;
     default:
         return;
@@ -266,7 +249,7 @@ void TServer::HandleEvent(TClient& c, const std::string& RawData) {
     // E:Name:Data
     // Data is allowed to have ':'
     if (RawData.size() < 2) {
-        beammp_debugf("Client '{}' ({}) tried to send an empty event, ignoring", c.Name.get(), c.ID.get());
+        beammp_debugf("Client '{}' ({}) tried to send an empty event, ignoring", c.GetName(), c.GetID());
         return;
     }
     auto NameDataSep = RawData.find(':', 2);
@@ -275,7 +258,7 @@ void TServer::HandleEvent(TClient& c, const std::string& RawData) {
     }
     std::string Name = RawData.substr(2, NameDataSep - 2);
     std::string Data = RawData.substr(NameDataSep + 1);
-    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent(Name, "", c.ID.get(), Data));
+    LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent(Name, "", c.GetID(), Data));
 }
 
 bool TServer::IsUnicycle(TClient& c, const std::string& CarJson) {
@@ -286,15 +269,14 @@ bool TServer::IsUnicycle(TClient& c, const std::string& CarJson) {
             return true;
         }
     } catch (const std::exception& e) {
-        beammp_warn("Failed to parse vehicle data as json for client " + std::to_string(c.ID.get()) + ": '" + CarJson + "'.");
+        beammp_warn("Failed to parse vehicle data as json for client " + std::to_string(c.GetID()) + ": '" + CarJson + "'.");
     }
     return false;
 }
 
 bool TServer::ShouldSpawn(TClient& c, const std::string& CarJson, int ID) {
-    auto UnicycleID = c.UnicycleID.synchronize();
-    if (IsUnicycle(c, CarJson) && *UnicycleID < 0) {
-        *UnicycleID = ID;
+    if (IsUnicycle(c, CarJson) && c.GetUnicycleID() < 0) {
+        c.SetUnicycleID(ID);
         return true;
     } else {
         return c.GetCarCount() < Application::Settings.MaxCars;
@@ -314,11 +296,11 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
         beammp_tracef("got 'Os' packet: '{}' ({})", Packet, Packet.size());
         if (Data.at(0) == '0') {
             int CarID = c.GetOpenCarID();
-            beammp_debugf("'{}' created a car with ID {}", c.Name.get(), CarID);
+            beammp_debugf("'{}' created a car with ID {}", c.GetName(), CarID);
 
             std::string CarJson = Packet.substr(5);
-            Packet = "Os:" + c.Role.get() + ":" + c.Name.get() + ":" + std::to_string(c.ID.get()) + "-" + std::to_string(CarID) + ":" + CarJson;
-            auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleSpawn", "", c.ID.get(), CarID, Packet.substr(3));
+            Packet = "Os:" + c.GetRoles() + ":" + c.GetName() + ":" + std::to_string(c.GetID()) + "-" + std::to_string(CarID) + ":" + CarJson;
+            auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleSpawn", "", c.GetID(), CarID, Packet.substr(3));
             TLuaEngine::WaitForAll(Futures);
             bool ShouldntSpawn = std::any_of(Futures.begin(), Futures.end(),
                 [](const std::shared_ptr<TLuaResult>& Result) {
@@ -332,11 +314,11 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
                 if (!Network.Respond(c, StringToVector(Packet), true)) {
                     // TODO: handle
                 }
-                std::string Destroy = "Od:" + std::to_string(c.ID.get()) + "-" + std::to_string(CarID);
+                std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(CarID);
                 if (!Network.Respond(c, StringToVector(Destroy), true)) {
                     // TODO: handle
                 }
-                beammp_debugf("{} (force : car limit/lua) removed ID {}", c.Name.get(), CarID);
+                beammp_debugf("{} (force : car limit/lua) removed ID {}", c.GetName(), CarID);
             }
         }
         return;
@@ -346,8 +328,8 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
         if (MaybePidVid) {
             std::tie(PID, VID) = MaybePidVid.value();
         }
-        if (PID != -1 && VID != -1 && PID == c.ID.get()) {
-            auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleEdited", "", c.ID.get(), VID, Packet.substr(3));
+        if (PID != -1 && VID != -1 && PID == c.GetID()) {
+            auto Futures = LuaAPI::MP::Engine->TriggerEvent("onVehicleEdited", "", c.GetID(), VID, Packet.substr(3));
             TLuaEngine::WaitForAll(Futures);
             bool ShouldntAllow = std::any_of(Futures.begin(), Futures.end(),
                 [](const std::shared_ptr<TLuaResult>& Result) {
@@ -356,16 +338,15 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
 
             auto FoundPos = Packet.find('{');
             FoundPos = FoundPos == std::string::npos ? 0 : FoundPos; // attempt at sanitizing this
-            auto UnicycleID = c.UnicycleID.synchronize();
-            if ((*UnicycleID != VID || IsUnicycle(c, Packet.substr(FoundPos)))
+            if ((c.GetUnicycleID() != VID || IsUnicycle(c, Packet.substr(FoundPos)))
                 && !ShouldntAllow) {
                 Network.SendToAll(&c, StringToVector(Packet), false, true);
                 Apply(c, VID, Packet);
             } else {
-                if (*UnicycleID == VID) {
-                    *UnicycleID = -1;
+                if (c.GetUnicycleID() == VID) {
+                    c.SetUnicycleID(-1);
                 }
-                std::string Destroy = "Od:" + std::to_string(c.ID.get()) + "-" + std::to_string(VID);
+                std::string Destroy = "Od:" + std::to_string(c.GetID()) + "-" + std::to_string(VID);
                 Network.SendToAll(nullptr, StringToVector(Destroy), true, true);
                 c.DeleteCar(VID);
             }
@@ -378,16 +359,15 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
         if (MaybePidVid) {
             std::tie(PID, VID) = MaybePidVid.value();
         }
-        if (PID != -1 && VID != -1 && PID == c.ID.get()) {
-            auto UnicycleID = c.UnicycleID.synchronize();
-            if (*UnicycleID == VID) {
-                *UnicycleID = -1;
+        if (PID != -1 && VID != -1 && PID == c.GetID()) {
+            if (c.GetUnicycleID() == VID) {
+                c.SetUnicycleID(-1);
             }
             Network.SendToAll(nullptr, StringToVector(Packet), true, true);
             // TODO: should this trigger on all vehicle deletions?
-            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.ID.get(), VID));
+            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleDeleted", "", c.GetID(), VID));
             c.DeleteCar(VID);
-            beammp_debug(c.Name.get() + (" deleted car with ID ") + std::to_string(VID));
+            beammp_debug(c.GetName() + (" deleted car with ID ") + std::to_string(VID));
         }
         return;
     }
@@ -398,9 +378,9 @@ void TServer::ParseVehicle(TClient& c, const std::string& Pckt, TNetwork& Networ
             std::tie(PID, VID) = MaybePidVid.value();
         }
 
-        if (PID != -1 && VID != -1 && PID == c.ID.get()) {
+        if (PID != -1 && VID != -1 && PID == c.GetID()) {
             Data = Data.substr(Data.find('{'));
-            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleReset", "", c.ID.get(), VID, Data));
+            LuaAPI::MP::Engine->ReportErrors(LuaAPI::MP::Engine->TriggerEvent("onVehicleReset", "", c.GetID(), VID, Data));
             Network.SendToAll(&c, StringToVector(Packet), false, true);
         }
         return;