aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
205src/json/json_helper.c 205src/json/json_helper.c
206src/json/json_mhd.c 206src/json/json_mhd.c
207src/messenger/gnunet-messenger.c 207src/messenger/gnunet-messenger.c
208src/messenger/gnunet-service-messenger.c
209src/messenger/gnunet-service-messenger_basement.c 208src/messenger/gnunet-service-messenger_basement.c
209src/messenger/gnunet-service-messenger.c
210src/messenger/gnunet-service-messenger_contact.c 210src/messenger/gnunet-service-messenger_contact.c
211src/messenger/gnunet-service-messenger_handle.c 211src/messenger/gnunet-service-messenger_handle.c
212src/messenger/gnunet-service-messenger_list_handles.c 212src/messenger/gnunet-service-messenger_list_handles.c
@@ -545,7 +545,5 @@ src/vpn/vpn_api.c
545src/zonemaster/gnunet-service-zonemaster.c 545src/zonemaster/gnunet-service-zonemaster.c
546src/zonemaster/gnunet-service-zonemaster-monitor.c 546src/zonemaster/gnunet-service-zonemaster-monitor.c
547src/fs/fs_api.h 547src/fs/fs_api.h
548src/include/gnunet_identity_service.h
549src/include/gnunet_messenger_service.h
550src/testbed/testbed_api.h 548src/testbed/testbed_api.h
551src/testbed/testbed_api_operations.h 549src/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
1668kce_generate_cb (void *cls) 1668kce_generate_cb (void *cls)
1669{ 1669{
1670 struct SharedSecret *ss = cls; 1670 struct SharedSecret *ss = cls;
1671 1671 kce_task = NULL;
1672
1673 1672
1674 if (ss->sender->acks_available < KCN_TARGET) 1673 if (ss->sender->acks_available < KCN_TARGET)
1675 { 1674 {
@@ -1699,6 +1698,7 @@ static void
1699kce_generate_rekey_cb (void *cls) 1698kce_generate_rekey_cb (void *cls)
1700{ 1699{
1701 struct SharedSecret *ss = cls; 1700 struct SharedSecret *ss = cls;
1701 kce_task_rekey = NULL;
1702 1702
1703 if (NULL == kce_task) 1703 if (NULL == kce_task)
1704 { 1704 {
@@ -3132,6 +3132,21 @@ do_shutdown (void *cls)
3132 GNUNET_SCHEDULER_cancel (broadcast_task); 3132 GNUNET_SCHEDULER_cancel (broadcast_task);
3133 broadcast_task = NULL; 3133 broadcast_task = NULL;
3134 } 3134 }
3135 if (NULL != kce_task_rekey)
3136 {
3137 GNUNET_SCHEDULER_cancel (kce_task_rekey);
3138 kce_task_rekey = NULL;
3139 }
3140 if (NULL != kce_task)
3141 {
3142 GNUNET_SCHEDULER_cancel (kce_task);
3143 kce_task = NULL;
3144 }
3145 if (NULL != timeout_task)
3146 {
3147 GNUNET_SCHEDULER_cancel (timeout_task);
3148 timeout_task = NULL;
3149 }
3135 if (NULL != read_task) 3150 if (NULL != read_task)
3136 { 3151 {
3137 GNUNET_SCHEDULER_cancel (read_task); 3152 GNUNET_SCHEDULER_cancel (read_task);