[GNUnet-SVN] r34624 - gnunet/src/cadet

[gnunet]

Author: bartpolot
Date: 2014-12-15 16:12:56 +0100 (Mon, 15 Dec 2014)
New Revision: 34624

Modified:
   gnunet/src/cadet/gnunet-service-cadet_tunnel.c
Log:
Fix empty tunnel detection

Modified: gnunet/src/cadet/gnunet-service-cadet_tunnel.c
===================================================================
--- gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-12-15 15:01:39 UTC 
(rev 34623)
+++ gnunet/src/cadet/gnunet-service-cadet_tunnel.c      2014-12-15 15:12:56 UTC 
(rev 34624)
@@ -2623,13 +2623,13 @@
     return;
   }
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s empty: destroying scheduled\n",
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s empty: scheduling destruction\n",
        GCT_2s (t));
 
   // FIXME make delay a config option
   t->destroy_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
                                                   &delayed_destroy, t);
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Scheduled destroy of %p as %llX\n",
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Scheduled destroy of %p as %llu\n",
        t, t->destroy_task);
 }
 
@@ -2643,7 +2643,7 @@
 GCT_destroy_if_empty (struct CadetTunnel *t)
 {
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s destroy if empty\n", GCT_2s (t));
-  if (1 < GCT_count_channels (t))
+  if (0 < GCT_count_channels (t))
     return;
 
   GCT_destroy_empty (t);