[GNUnet-SVN] r17809 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2011-10-27 03:29:44 +0200 (Thu, 27 Oct 2011)
New Revision: 17809

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
Attempt to fix assertion failures on buildbot related to RC of client 
(keep/drop)

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2011-10-27 01:05:23 UTC (rev 
17808)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2011-10-27 01:29:44 UTC (rev 
17809)
@@ -3248,7 +3248,6 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH:    (SERVER DOWN)\n");
     return;
   }
-  GNUNET_SERVER_client_drop (client);
   c = clients;
   while (NULL != c)
   {
@@ -3259,6 +3258,7 @@
       continue;
     }
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: matching client found\n");
+    GNUNET_SERVER_client_drop (c->handle);
     if (NULL != c->tunnels)
     {
       GNUNET_CONTAINER_multihashmap_iterate (c->tunnels,
@@ -3314,7 +3314,6 @@
   uint16_t i;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH: new client connected\n");
-  GNUNET_SERVER_client_keep (client);
   /* Check data sanity */
   size = ntohs (message->size) - sizeof (struct GNUNET_MESH_ClientConnect);
   cc_msg = (struct GNUNET_MESH_ClientConnect *) message;
@@ -3335,6 +3334,7 @@
 #endif
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MESH:   CLIENT NEW %u at %p\n", c->id, 
c);
   c->handle = client;
+  GNUNET_SERVER_client_keep (client);
   a = (GNUNET_MESH_ApplicationType *) &cc_msg[1];
   if (napps > 0)
   {