-fix communicator cleanup

po/POTFILES.in

@@ -205,8 +205,8 @@ src/json/json_generator.c
 src/json/json_helper.c
 src/json/json_mhd.c
 src/messenger/gnunet-messenger.c
-src/messenger/gnunet-service-messenger.c
 src/messenger/gnunet-service-messenger_basement.c
+src/messenger/gnunet-service-messenger.c
 src/messenger/gnunet-service-messenger_contact.c
 src/messenger/gnunet-service-messenger_handle.c
 src/messenger/gnunet-service-messenger_list_handles.c
@@ -545,7 +545,5 @@ src/vpn/vpn_api.c
 src/zonemaster/gnunet-service-zonemaster.c
 src/zonemaster/gnunet-service-zonemaster-monitor.c
 src/fs/fs_api.h
-src/include/gnunet_identity_service.h
-src/include/gnunet_messenger_service.h
 src/testbed/testbed_api.h
 src/testbed/testbed_api_operations.h

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);