summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2020-11-30 13:19:49 +0900
committerMartin Schanzenbach <schanzen@gnunet.org>2020-11-30 13:19:49 +0900
commit430ed7f8b4b33295e84990ec97cbb71431cef923 (patch)
treef929c74c575755e771258917b4f7e11b844dd3b6
parent97782d1a85e43d55626b150c06b6479afd8d20d6 (diff)
-fix communicator cleanup
-rw-r--r--po/POTFILES.in4
-rw-r--r--src/transport/gnunet-communicator-udp.c19
2 files changed, 18 insertions, 5 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 00bdd7cbc..b0371ba21 100644
--- a/po/POTFILES.in
+++ b/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
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);