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

[gnunet]

Author: bartpolot
Date: 2012-07-31 16:43:34 +0200 (Tue, 31 Jul 2012)
New Revision: 23016

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
- make sure to always have GNUNET_break immediately before client_receive_done 
with SYSERR

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2012-07-31 14:23:25 UTC (rev 
23015)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2012-07-31 14:43:34 UTC (rev 
23016)
@@ -3173,7 +3173,7 @@
     {
       GNUNET_SCHEDULER_cancel(*(mdata->task));
       GNUNET_free (mdata->task);
-      GNUNET_SERVER_receive_done(t->owner->handle, GNUNET_OK);
+      GNUNET_SERVER_receive_done (t->owner->handle, GNUNET_OK);
     }
     // FIXME change order?
     GNUNET_free (mdata);
@@ -3571,7 +3571,10 @@
     GNUNET_break (0);
     tunnel_destroy (t);
     if (NULL != client)
+    {
+      GNUNET_break (0);
       GNUNET_SERVER_receive_done (client->handle, GNUNET_SYSERR);
+    }
     return NULL;
   }
 
@@ -3582,8 +3585,8 @@
         GNUNET_CONTAINER_multihashmap_put (client->own_tunnels, &hash, t,
                                           
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
     {
+      tunnel_destroy (t);
       GNUNET_break (0);
-      tunnel_destroy (t);
       GNUNET_SERVER_receive_done (client->handle, GNUNET_SYSERR);
       return NULL;
     }
@@ -5490,6 +5493,7 @@
   if (NULL == t)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Tunnel creation failed.\n");
+    GNUNET_break (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
@@ -5545,8 +5549,8 @@
   t = tunnel_get_by_local_id(c, tid);
   if (NULL == t)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "  tunnel %X not found\n", tid);
     GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "  tunnel %X not found\n", tid);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
@@ -5617,8 +5621,8 @@
   t = tunnel_get_by_local_id(c, tid);
   if (NULL == t)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "  tunnel %X not found\n", tid);
     GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "  tunnel %X not found\n", tid);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
@@ -5673,8 +5677,8 @@
   t = tunnel_get_by_local_id(c, tid);
   if (NULL == t)
   {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "  tunnel %X not found\n", tid);
     GNUNET_break (0);
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "  tunnel %X not found\n", tid);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
     return;
   }
@@ -6099,9 +6103,9 @@
   /* Message size sanity check */
   if (sizeof(struct GNUNET_MESH_ConnectPeerByString) >= size)
   {
-      GNUNET_break (0);
-      GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-      return;
+    GNUNET_break (0);
+    GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+    return;
   }
 
   /* Tunnel exists? */