diff options
author | Bart Polot <bart@net.in.tum.de> | 2014-12-15 15:12:56 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2014-12-15 15:12:56 +0000 |
commit | 81cae021cea2e49d791a21e2dcbac39f59302c82 (patch) | |
tree | 210bd4a5554448538686b52119849b76db8e0b83 | |
parent | 8094e23bf7e13b1c203ba8b85e5edcbfdf5ff650 (diff) | |
download | gnunet-81cae021cea2e49d791a21e2dcbac39f59302c82.tar.gz gnunet-81cae021cea2e49d791a21e2dcbac39f59302c82.zip |
Fix empty tunnel detection
-rw-r--r-- | src/cadet/gnunet-service-cadet_tunnel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cadet/gnunet-service-cadet_tunnel.c b/src/cadet/gnunet-service-cadet_tunnel.c index f1cbad63c..e19a60961 100644 --- a/src/cadet/gnunet-service-cadet_tunnel.c +++ b/src/cadet/gnunet-service-cadet_tunnel.c | |||
@@ -2623,13 +2623,13 @@ GCT_destroy_empty (struct CadetTunnel *t) | |||
2623 | return; | 2623 | return; |
2624 | } | 2624 | } |
2625 | 2625 | ||
2626 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s empty: destroying scheduled\n", | 2626 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s empty: scheduling destruction\n", |
2627 | GCT_2s (t)); | 2627 | GCT_2s (t)); |
2628 | 2628 | ||
2629 | // FIXME make delay a config option | 2629 | // FIXME make delay a config option |
2630 | t->destroy_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, | 2630 | t->destroy_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES, |
2631 | &delayed_destroy, t); | 2631 | &delayed_destroy, t); |
2632 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Scheduled destroy of %p as %llX\n", | 2632 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Scheduled destroy of %p as %llu\n", |
2633 | t, t->destroy_task); | 2633 | t, t->destroy_task); |
2634 | } | 2634 | } |
2635 | 2635 | ||
@@ -2643,7 +2643,7 @@ void | |||
2643 | GCT_destroy_if_empty (struct CadetTunnel *t) | 2643 | GCT_destroy_if_empty (struct CadetTunnel *t) |
2644 | { | 2644 | { |
2645 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s destroy if empty\n", GCT_2s (t)); | 2645 | LOG (GNUNET_ERROR_TYPE_DEBUG, "Tunnel %s destroy if empty\n", GCT_2s (t)); |
2646 | if (1 < GCT_count_channels (t)) | 2646 | if (0 < GCT_count_channels (t)) |
2647 | return; | 2647 | return; |
2648 | 2648 | ||
2649 | GCT_destroy_empty (t); | 2649 | GCT_destroy_empty (t); |