this should fix message sends across reconnect

mas-bandwidth · Dec 26, 2023 · 06358cf · 06358cf
1 parent 98aa26f
commit 06358cf
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 0 deletions.
diff --git a/include/yojimbo_base_client.h b/include/yojimbo_base_client.h
@@ -137,6 +137,10 @@ namespace yojimbo
 
         static void StaticFreeFunction( void * context, void * pointer );
 
+    protected:
+
+        virtual void Reset();
+
     private:
 
         ClientServerConfig m_config;                                        ///< The client/server configuration.

diff --git a/include/yojimbo_base_server.h b/include/yojimbo_base_server.h
@@ -117,6 +117,10 @@ namespace yojimbo
 
         static void StaticFreeFunction( void * context, void * pointer );
 
+    protected:
+
+        virtual void ResetClient( int clientIndex );
+
     private:
 
         ClientServerConfig m_config;                                ///< Base client/server config.

diff --git a/source/yojimbo_base_client.cpp b/source/yojimbo_base_client.cpp
@@ -59,6 +59,7 @@ namespace yojimbo
     void BaseClient::Disconnect()
     {
         SetClientState( CLIENT_STATE_DISCONNECTED );
+        Reset();
     }
 
     void BaseClient::AdvanceTime( double time )
@@ -275,4 +276,12 @@ namespace yojimbo
             reliable_endpoint_bandwidth( m_endpoint, &info.sentBandwidth, &info.receivedBandwidth, &info.ackedBandwidth );
         }
     }
+
+    void BaseClient::Reset()
+    {
+        if ( m_connection )
+        {
+            m_connection->Reset();
+        }
+    }
 }
diff --git a/source/yojimbo_base_server.cpp b/source/yojimbo_base_server.cpp
@@ -328,4 +328,9 @@ namespace yojimbo
         Allocator * allocator = (Allocator*) context;
         YOJIMBO_FREE( *allocator, pointer );
     }
+
+    void BaseServer::ResetClient( int clientIndex )
+    {
+        m_clientConnection[clientIndex]->Reset();
+    }
 }
diff --git a/source/yojimbo_server.cpp b/source/yojimbo_server.cpp
@@ -98,12 +98,18 @@ namespace yojimbo
     {
         yojimbo_assert( m_server );
         netcode_server_disconnect_client( m_server, clientIndex );
+        ResetClient( clientIndex );
     }
 
     void Server::DisconnectAllClients()
     {
         yojimbo_assert( m_server );
         netcode_server_disconnect_all_clients( m_server );
+        const int maxClients = GetMaxClients();
+        for ( int i = 0; i < maxClients; ++i )
+        {
+            ResetClient( i );
+        }
     }
 
     void Server::SendPackets()