X-Git-Url: http://developer.intra2net.com/git/?p=libt2n;a=blobdiff_plain;f=src%2Fsocket_server.cpp;fp=src%2Fsocket_server.cpp;h=a5ec5d0d5e777cff884fceea0e86fee889d905d0;hp=ad8bb844e22193394095e51add4eebeaa3f5f718;hb=56f3994d74dbc36d10bfa83b50b016bf269ac563;hpb=c72238fb7fc6eb081c2a0bc95fff369c760343f4

diff --git a/src/socket_server.cpp b/src/socket_server.cpp
index ad8bb84..a5ec5d0 100644
--- a/src/socket_server.cpp
+++ b/src/socket_server.cpp
@@ -129,12 +129,27 @@ socket_server::socket_server(const std::string& path, mode_t filemode, const std
     start_listening();
 }
 
+/**
+ * Destructor
+ */
 socket_server::~socket_server()
 {
-    socket_handler::close();
+    // close all client connections
+    server::close();
+
+    // server socket will be closed by destructor of socket_handler
 
     if (get_type()==unix_s)
         unlink(unix_path.c_str());
+
+    // disconnect connection<->server pointer
+    std::map<unsigned int, server_connection*>::iterator it, it_end = connections.end();
+    for (it = connections.begin(); it != it_end; ++it)
+    {
+        socket_server_connection *conn = dynamic_cast<socket_server_connection*>(it->second);
+        if (conn)
+            conn->my_server = NULL;
+    }
 }
 
 /// start listening on a new server socket (called by the constructors)
@@ -272,18 +287,35 @@ void socket_server::remove_connection_socket(int sock)
     FD_CLR(sock, &connection_set);
 }
 
+/**
+ * Destructor
+ */
+socket_server_connection::~socket_server_connection()
+{
+    // Only notify parent server about going down.
+    // The real socket will be closed by the destructor of the base classes.
+    if (my_server && sock != -1)
+    {
+        socket_server *srv = dynamic_cast<socket_server*>(my_server);
+        if (srv)
+            srv->remove_connection_socket(sock);
+    }
+}
+
 /// close this connection. complete data waiting in the buffer can still be retrieved.
 void socket_server_connection::close()
 {
-    if (!server_connection::is_closed())
+    if (my_server && sock != -1)
     {
-        socket_handler::close();
-        server_connection::close();
+        socket_server *srv = dynamic_cast<socket_server*>(my_server);
+        if (srv)
+            srv->remove_connection_socket(sock);
     }
 
-    if (my_server)
+    if (!server_connection::is_closed())
     {
-        dynamic_cast<socket_server*>(my_server)->remove_connection_socket(sock);
+        socket_handler::close();
+        server_connection::close();
     }
 }