Merge branch 'dev' of https://github.com/Gallasko/PgEngine into dev

Author: Gallasko

.vscode/launch.json

@@ -82,6 +82,33 @@
             // },
             // "preLaunchTask": "build"
         },
+        {
+            "name": "NetworkTestServer",
+            "type": "cppdbg",
+            "request": "launch",
+            "args": ["--mode=server"],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "linux": {
+                "MIMode": "gdb",
+                "miDebuggerPath": "gdb",
+                "program": "${workspaceFolder}/build/SimpleClientServer"
+            },
+            "osx": {
+                "MIMode": "lldb",
+                "miDebuggerPath": "lldb-mi",
+                "program": "${workspaceFolder}/debug/main"
+            },
+            "windows": {
+                "MIMode": "gdb",
+                "miDebuggerPath": "gdb.exe",
+                "program": "${workspaceFolder}/debug/GameOff.exe"
+            }
+            // },
+            // "preLaunchTask": "build"
+        },
         {
             "name": "Test",
             "type": "cppdbg",

src/Engine/Networking/backend_sdl.cpp

@@ -65,6 +65,9 @@ namespace pg
 
         auto newSock = SDLNet_TCP_Accept(_listener);
 
+        if (not newSock)
+            return nullptr;
+
         bool addedToSet = false;
 
         for (size_t setId = 0; setId < sockSets.size(); setId++)
@@ -132,12 +135,38 @@ namespace pg
         return _isConnectedToServer;
     }
 
+    void SdlNetworkBackend::disconnectFromServer()
+    {
+        if (_tcpSock)
+        {
+            SDLNet_TCP_DelSocket(sockSet, _tcpSock);
+            SDLNet_TCP_Close(_tcpSock);
+            _tcpSock = nullptr;
+        }
+
+        if (_udpSock)
+        {
+            SDLNet_UDP_Close(_udpSock);
+            _udpSock = nullptr;
+        }
+
+        _isConnectedToServer = false;
+    }
+
     void SdlNetworkBackend::closeTcp(SocketHandle sock)
     {
         if (sock)
         {
-            SDLNet_TCP_DelSocket(sockSet, static_cast<TCPsocket>(sock));
-            SDLNet_TCP_Close(static_cast<TCPsocket>(sock));
+            auto tcpSock = static_cast<TCPsocket>(sock);
+
+            auto it = sockSetsMap.find(tcpSock);
+            if (it != sockSetsMap.end())
+            {
+                SDLNet_TCP_DelSocket(it->second, tcpSock);
+                sockSetsMap.erase(it);
+            }
+
+            SDLNet_TCP_Close(tcpSock);
         }
     }
 
@@ -231,7 +260,7 @@ namespace pg
             }
             else
             {
-                _isConnectedToServer = false;
+                disconnectFromServer();
                 LOG_ERROR(DOM, "TCP receive failed, disconnected from server !");
             }
         }
@@ -318,7 +347,7 @@ namespace pg
             }
             else
             {
-                _isConnectedToServer = false;
+                disconnectFromServer();
                 socketClosed = true;
 
                 LOG_ERROR(DOM, "TCP receive failed, disconnected from server !");

src/Engine/Networking/backend_sdl.h

@@ -20,6 +20,7 @@ namespace pg
 
         // Client‐side: connect to server using cfg.peerAddress/cfg.tcpPort
         bool connectToServer() override;
+        virtual void disconnectFromServer() override;
 
         virtual void closeTcp(SocketHandle sock) override;
 

src/Engine/Networking/common.cpp

@@ -120,6 +120,9 @@ namespace pg
         if (hdr.fragmentIndex >= hdr.totalFragments)
             return false;
 
+        if (HEADER_SIZE + hdr.payloadLen > raw.size())
+            return false;
+
         slots[hdr.fragmentIndex] =
             NetPayload(
             raw.begin() + HEADER_SIZE,

src/Engine/Networking/ibackend.h

@@ -19,6 +19,7 @@ namespace pg
 
         // Client-side: try to connect; return true on success
         virtual bool connectToServer() = 0;
+        virtual void disconnectFromServer() = 0;
 
         bool _isConnectedToServer = false;
         inline bool isConnectedToServer() const { return _isConnectedToServer; }

src/Engine/Networking/network_system.cpp

@@ -299,6 +299,12 @@ namespace pg
                 handleClientMessage(msg.header, msg.payload);
             }
         }
+
+        // If we were disconnected going back to trying to connect to server
+        if (not backend->isConnectedToServer())
+        {
+            currentClientState = ClientState::Connecting;
+        }
     }
 
     void NetworkSystem::handleMessage(const PacketHeader&, const NetPayload&)