-fix communicator cleanup

1 files changed, 17 insertions, 2 deletions

diff --git a/src/transport/gnunet-communicator-udp.c b/src/transport/gnunet-communicator-udp.c
index 849adf4ab..073b1ea02 100644
--- a/src/transport/gnunet-communicator-udp.c
+++ b/src/transport/gnunet-communicator-udp.c
@@ -1668,8 +1668,7 @@ static void
 kce_generate_cb (void *cls)
 {
   struct SharedSecret *ss = cls;
-
-
+  kce_task = NULL;
 
   if (ss->sender->acks_available < KCN_TARGET)
   {
@@ -1699,6 +1698,7 @@ static void
 kce_generate_rekey_cb (void *cls)
 {
   struct SharedSecret *ss = cls;
+  kce_task_rekey = NULL;
 
   if (NULL == kce_task)
   {
@@ -3132,6 +3132,21 @@ do_shutdown (void *cls)
     GNUNET_SCHEDULER_cancel (broadcast_task);
     broadcast_task = NULL;
   }
+  if (NULL != kce_task_rekey)
+  {
+    GNUNET_SCHEDULER_cancel (kce_task_rekey);
+    kce_task_rekey = NULL;
+  }
+  if (NULL != kce_task)
+  {
+    GNUNET_SCHEDULER_cancel (kce_task);
+    kce_task = NULL;
+  }
+  if (NULL != timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (timeout_task);
+    timeout_task = NULL;
+  }
   if (NULL != read_task)
   {
     GNUNET_SCHEDULER_cancel (read_task);