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

[libt2n] / src / socket_server.cpp

diff --git a/src/socket_server.cpp b/src/socket_server.cpp
index 1fc99d8..a5ec5d0 100644 (file)
--- a/src/socket_server.cpp
+++ b/src/socket_server.cpp
@@ -67,7 +67,10 @@ socket_server::socket_server(int port, const std::string& ip)
         EXCEPTIONSTREAM(error,t2n_server_error,"failed listening on invalid ip " << ip);
 
     if (bind (sock, (struct sockaddr *) &sockaddr, sizeof (sockaddr)) < 0)
+    {
+        // FIXME: Calls virtual function socket_server::get_logstream() in constructor
         EXCEPTIONSTREAM(error,t2n_server_error,"error binding socket: " << strerror(errno));
+    }
 
     start_listening();
 }
@@ -83,6 +86,8 @@ socket_server::socket_server(const std::string& path, mode_t filemode, const std
 {
     unix_path=path;
 
+    // TODO: Every EXCEPTIONSTREAM in here calls virtual function get_logstream()
+
     /* Create the socket. */
     sock = socket (PF_UNIX, SOCK_STREAM, 0);
     if (sock < 0)
@@ -124,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)
@@ -240,7 +260,7 @@ bool socket_server::fill_buffer(long long usec_timeout,long long* usec_timeout_r
 /// call fill_buffer() on all connections, called from fill_buffer()
 bool socket_server::fill_connection_buffers()
 {
-    bool data_found;
+    bool data_found = false;
 
     std::map<unsigned int, server_connection*>::iterator ie=connections.end();
     for(std::map<unsigned int, server_connection*>::iterator i=connections.begin(); i != ie; i++)
@@ -267,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();
     }
 }