The server and multiserver now support a shutdown() function which calls

onCloseConnection on each client before cleaning it up, allowing for smooth
cleanup.  Later we may want to add a nicer version with a timeout for pending
data to be transmitted and the like.  This one is pretty harsh.

1 files changed, 19 insertions, 9 deletions

diff --git a/src/server.cpp b/src/server.cpp
index 8bc1767..80ed509 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -23,15 +23,7 @@ Bu::Server::Server() :
 
 Bu::Server::~Server()
 {
-        for( SrvHash::iterator i = hServers.begin(); i != hServers.end(); i++ )
-        {
-                delete *i;
-        }
-
-        for( ClientHash::iterator i = hClients.begin(); i != hClients.end(); i++ )
-        {
-                delete *i;
-        }
+        shutdown();
 }
 
 void Bu::Server::addPort( int nPort, int nPoolSize )
@@ -185,3 +177,21 @@ void Bu::Server::tick()
         }
 }
 
+void Bu::Server::shutdown()
+{
+        for( SrvHash::iterator i = hServers.begin(); i != hServers.end(); i++ )
+        {
+                delete *i;
+        }
+
+        hServers.clear();
+
+        for( ClientHash::iterator i = hClients.begin(); i != hClients.end(); i++ )
+        {
+                onClosedConnection( *i );
+                delete *i;
+        }
+
+        hClients.clear();
+}
+