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

[gnunet]

Author: bartpolot
Date: 2013-09-06 15:00:05 +0200 (Fri, 06 Sep 2013)
New Revision: 29072

Modified:
   gnunet/src/mesh/gnunet-service-mesh-enc.c
Log:
- dont prevent destroy in case of fully initialized channel

Modified: gnunet/src/mesh/gnunet-service-mesh-enc.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh-enc.c   2013-09-06 12:41:49 UTC (rev 
29071)
+++ gnunet/src/mesh/gnunet-service-mesh-enc.c   2013-09-06 13:00:05 UTC (rev 
29072)
@@ -4540,13 +4540,11 @@
   struct MeshChannel *ch = value;
   struct MeshClient *c = cls;
   struct MeshTunnel2 *t;
-  int loopback;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               " Channel %X (%X / %X) destroy, due to client %u shutdown.\n",
               ch->gid, ch->lid_root, ch->lid_dest, c->id);
   channel_debug (ch);
-  loopback = ( (NULL != ch->root) && (NULL != ch->dest) );
 
   if (c == ch->dest)
   {
@@ -4559,11 +4557,7 @@
 
   t = ch->t;
   channel_send_destroy (ch);
-  if (GNUNET_NO == loopback)
-  {
-    /* In loopback, channel will be destroyed by the channel_destroy handler */
-    channel_destroy (ch);
-  }
+  channel_destroy (ch);
   tunnel_destroy_if_empty (t);
 
   return GNUNET_OK;