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

[gnunet]

Author: bartpolot
Date: 2013-07-16 14:06:18 +0200 (Tue, 16 Jul 2013)
New Revision: 28089

Modified:
   gnunet/src/mesh/gnunet-service-mesh.c
Log:
- destroy tunnel at the end of the function

Modified: gnunet/src/mesh/gnunet-service-mesh.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh.c       2013-07-16 11:52:24 UTC (rev 
28088)
+++ gnunet/src/mesh/gnunet-service-mesh.c       2013-07-16 12:06:18 UTC (rev 
28089)
@@ -3376,12 +3376,6 @@
       break;
   }
 
-  if (GNUNET_YES == t->destroy && 0 == t->pending_messages)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "*  destroying tunnel!\n");
-    tunnel_destroy (t);
-  }
-
   /* If more data in queue, send next */
   queue = queue_get_next (peer);
   if (NULL != queue)
@@ -3409,6 +3403,8 @@
     else
     {
       GNUNET_break (0);
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "id: %u, next: %u, prev: %u\n",
+                  peer->id, t->next_hop, t->prev_hop);
       return data_size;
     }
     if (GNUNET_SCHEDULER_NO_TASK == fc->poll_task && fc->queue_n > 0)
@@ -3421,6 +3417,11 @@
                                                     &tunnel_poll, fc);
     }
   }
+  if (GNUNET_YES == t->destroy && 0 == t->pending_messages)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "*  destroying tunnel!\n");
+    tunnel_destroy (t);
+  }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "*  Return %d\n", data_size);
   return data_size;
 }