libt2n: (gerd) make handle-function on server reentrant

[libt2n] / src / command_server.cpp

diff --git a/src/command_server.cpp b/src/command_server.cpp
index f596860..6146981 100644 (file)
--- a/src/command_server.cpp
+++ b/src/command_server.cpp
@@ -44,7 +44,7 @@ namespace libt2n
 {
 
 command_server::command_server(server& _s)
-    : s(_s)
+    : s(_s), guard_handle(0)
 {
     // register callback
     s.add_callback(new_connection,bind(&command_server::send_hello, boost::ref(*this), _1));
@@ -160,29 +160,42 @@ void command_server::handle_packet(const std::string& packet, server_connection*
 */
 void command_server::handle(long long usec_timeout, long long* usec_timeout_remaining)
 {
-    if (s.fill_buffer(usec_timeout,usec_timeout_remaining))
+    guard_handle++;
+    try
     {
-        std::string packet;
-        unsigned int conn_id;
-
-        while (s.get_packet(packet,conn_id))
+        if (s.fill_buffer(usec_timeout,usec_timeout_remaining))
         {
-            server_connection* conn=s.get_connection(conn_id);
-            if (!conn)
-                EXCEPTIONSTREAM(error,logic_error,"illegal connection id " << conn_id << " received");
+            std::string packet;
+            unsigned int conn_id;
 
-            try
-                { handle_packet(packet,conn); }
-            catch (t2n_transfer_error &e)
+            while (s.get_packet(packet,conn_id))
             {
-                // shut down a connection with transfer errors (usually write errors)
-                conn->close();
+                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)
+                {
+                    // shut down a connection with transfer errors (usually write errors)
+                    conn->close();
+                }
+                catch(...)
+                    { throw; }
             }
-            catch(...)
-                { throw; }
         }
     }
-    s.cleanup();
+    catch(...)
+    {
+        guard_handle--;
+        throw;
+    }
+    guard_handle--;
+
+    // don't call cleanup on re-entered handle-calls
+    if (guard_handle == 0)
+        s.cleanup();
 }
 
 }