handle errors better

[oweals/gnunet.git] / src / util / server.c

diff --git a/src/util/server.c b/src/util/server.c
index 131c7c5c1fdc01daead809e0b12426b7ac2061b6..7c00bb782e09520105b624646218ea9a5fb94f46 100644 (file)
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -759,7 +759,7 @@ process_incoming (void *cls,
       (client->shutdown_now == GNUNET_YES) ||
       (GNUNET_YES != client->check (client->client_closure)))
     {
-      /* other side closed connection, error connecting, etc. */      
+      /* other side closed connection, error connecting, etc. */
       GNUNET_SERVER_client_disconnect (client);
       return;
     }
@@ -956,8 +956,7 @@ sock_destroy (void *cls, int persist)
 {
   struct GNUNET_CONNECTION_Handle *sock = cls;
   if (persist == GNUNET_YES)
-    GNUNET_CONNECTION_persist_ (sock);
-
+    GNUNET_CONNECTION_persist_ (sock);  
   GNUNET_CONNECTION_destroy (sock, GNUNET_NO);
 }
 
@@ -1219,9 +1218,21 @@ GNUNET_SERVER_client_disconnect (struct GNUNET_SERVER_Client *client)
         }
     }
   if (rc > 0)
-    return;
+    {
+#if DEBUG_SERVER
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "RC still positive, not destroying everything.\n");
+#endif
+      return;
+    }
   if (client->in_process_client_buffer == GNUNET_YES)
-    return;
+    {
+#if DEBUG_SERVER
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                 "Still processing inputs, not destroying everything.\n");
+#endif
+      return;
+    }
   client->destroy (client->client_closure, client->persist);
   GNUNET_free (client);  
 }