diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-01-20 08:35:39 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-01-20 08:35:39 +0000 |
commit | b298fe671bbe804b63e5aedfc7f2bf8d4a3fd2f9 (patch) | |
tree | b56a16630e80737882003cbcbcd6506a68489005 /src/vpn | |
parent | 2099db186436a43afa2babfd55e6e8b6d0a4991d (diff) | |
download | gnunet-b298fe671bbe804b63e5aedfc7f2bf8d4a3fd2f9.tar.gz gnunet-b298fe671bbe804b63e5aedfc7f2bf8d4a3fd2f9.zip |
-partial fix to #2090
Diffstat (limited to 'src/vpn')
-rw-r--r-- | src/vpn/gnunet-service-vpn.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c index 8a4e308bf..95b8dd24b 100644 --- a/src/vpn/gnunet-service-vpn.c +++ b/src/vpn/gnunet-service-vpn.c | |||
@@ -512,11 +512,6 @@ free_tunnel_state (struct TunnelState *ts) | |||
512 | GNUNET_STATISTICS_update (stats, | 512 | GNUNET_STATISTICS_update (stats, |
513 | gettext_noop ("# Active tunnels"), | 513 | gettext_noop ("# Active tunnels"), |
514 | -1, GNUNET_NO); | 514 | -1, GNUNET_NO); |
515 | if (GNUNET_SCHEDULER_NO_TASK != ts->destroy_task) | ||
516 | { | ||
517 | GNUNET_SCHEDULER_cancel (ts->destroy_task); | ||
518 | ts->destroy_task = GNUNET_SCHEDULER_NO_TASK; | ||
519 | } | ||
520 | while (NULL != (tnq = ts->tmq_head)) | 515 | while (NULL != (tnq = ts->tmq_head)) |
521 | { | 516 | { |
522 | GNUNET_CONTAINER_DLL_remove (ts->tmq_head, | 517 | GNUNET_CONTAINER_DLL_remove (ts->tmq_head, |
@@ -542,6 +537,11 @@ free_tunnel_state (struct TunnelState *ts) | |||
542 | ts->tunnel = NULL; | 537 | ts->tunnel = NULL; |
543 | GNUNET_MESH_tunnel_destroy (tunnel); | 538 | GNUNET_MESH_tunnel_destroy (tunnel); |
544 | } | 539 | } |
540 | if (GNUNET_SCHEDULER_NO_TASK != ts->destroy_task) | ||
541 | { | ||
542 | GNUNET_SCHEDULER_cancel (ts->destroy_task); | ||
543 | ts->destroy_task = GNUNET_SCHEDULER_NO_TASK; | ||
544 | } | ||
545 | if (NULL != ts->heap_node) | 545 | if (NULL != ts->heap_node) |
546 | { | 546 | { |
547 | GNUNET_CONTAINER_heap_remove_node (ts->heap_node); | 547 | GNUNET_CONTAINER_heap_remove_node (ts->heap_node); |