libt2n: (tomj) fixed call of virtual function close() from destructor, fixed return...

[libt2n] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 30bf7d3..749f4fb 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -30,12 +30,19 @@ namespace libt2n
 {
 
 server_connection::server_connection(int _timeout)
-    : connection()
+    : connection_id(0)
+    , my_server(NULL)
+    , connection()
 {
     set_timeout(_timeout);
     reset_timeout();
-    connection_id=0;
-    my_server=0;
+}
+
+/**
+ * Destructor
+ */
+server_connection::~server_connection()
+{
 }
 
 /// get pointer to logging stream, returns NULL if no logging needed
@@ -94,6 +101,18 @@ server::~server()
     std::map<unsigned int, server_connection*>::iterator ie=connections.end();
     for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
         delete i->second;
+
+    connections.clear();
+}
+
+/**
+ * Close all open connections
+ */
+void server::close()
+{
+    std::map<unsigned int, server_connection*>::iterator ie=connections.end();
+    for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; ++i)
+        i->second->close();
 }
 
 /** @brief add a callback
@@ -131,7 +150,7 @@ void server::do_callbacks(callback_event_type event, unsigned int conn_id)
 }
 
 /// add a new connection to the server
-int server::add_connection(server_connection* newconn)
+unsigned int server::add_connection(server_connection* newconn)
 {
     unsigned int cid=next_id++;
     newconn->set_id(cid);