aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-04-01 17:59:40 +0000
committerChristian Grothoff <christian@grothoff.org>2012-04-01 17:59:40 +0000
commitff75fee8db5fa41b951bce6fdc109ea901679c70 (patch)
tree235dc84acfda34f5515b287fb342ad914a777ef2 /src/core
parent385767a3fee932531de200def49ccec77b478157 (diff)
downloadgnunet-ff75fee8db5fa41b951bce6fdc109ea901679c70.tar.gz
gnunet-ff75fee8db5fa41b951bce6fdc109ea901679c70.zip
-fix
Diffstat (limited to 'src/core')
-rw-r--r--src/core/gnunet-service-core_kx.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c
index 028c93fe7..0cc3521ac 100644
--- a/src/core/gnunet-service-core_kx.c
+++ b/src/core/gnunet-service-core_kx.c
@@ -1286,7 +1286,11 @@ GSC_KX_handle_pong (struct GSC_KeyExchangeInfo *kx,
1286static void 1286static void
1287send_key (struct GSC_KeyExchangeInfo *kx) 1287send_key (struct GSC_KeyExchangeInfo *kx)
1288{ 1288{
1289 GNUNET_assert (kx->retry_set_key_task == GNUNET_SCHEDULER_NO_TASK); 1289 if (kx->retry_set_key_task != GNUNET_SCHEDULER_NO_TASK)
1290 {
1291 GNUNET_SCHEDULER_cancel (kx->retry_set_key_task);
1292 kx->retry_set_key_task = GNUNET_SCHEDULER_NO_TASK;
1293 }
1290 if (KX_STATE_UP == kx->status) 1294 if (KX_STATE_UP == kx->status)
1291 return; /* nothing to do */ 1295 return; /* nothing to do */
1292 if (kx->public_key == NULL) 1296 if (kx->public_key == NULL)