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

[libt2n] / src / command_server.cpp

diff --git a/src/command_server.cpp b/src/command_server.cpp
index 6146981..8c4bb42 100644 (file)
--- a/src/command_server.cpp
+++ b/src/command_server.cpp
@@ -50,10 +50,21 @@ command_server::command_server(server& _s)
     s.add_callback(new_connection,bind(&command_server::send_hello, boost::ref(*this), _1));
 }
 
+/**
+ * Destructor
+ */
+command_server::~command_server()
+{
+}
+
+/// send a hello message to a new connection
 void command_server::send_hello(unsigned int conn_id)
 {
     server_connection* sc=s.get_connection(conn_id);
 
+    if (!sc)
+        return;         // connection not existing, so no hello
+
     std::ostringstream hello;
 
     hello << "T2Nv" << PROTOCOL_VERSION << ';';
@@ -157,23 +168,24 @@ void command_server::handle_packet(const std::string& packet, server_connection*
 /** @brief handle incoming commands
     @param[in,out] usec_timeout wait until new data is found, max timeout usecs.
             -1: wait endless, 0: instant return
+    @param[out] usec_timeout_remaining microseconds from the timeout that were not used
 */
 void command_server::handle(long long usec_timeout, long long* usec_timeout_remaining)
 {
     guard_handle++;
+
     try
     {
         if (s.fill_buffer(usec_timeout,usec_timeout_remaining))
         {
             std::string packet;
-            unsigned int conn_id;
+            unsigned int conn_id = 0;
 
             while (s.get_packet(packet,conn_id))
             {
                 server_connection* conn=s.get_connection(conn_id);
                 if (!conn)
                     EXCEPTIONSTREAM(error,logic_error,"illegal connection id " << conn_id << " received");
-
                 try
                     { handle_packet(packet,conn); }
                 catch (t2n_transfer_error &e)