[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20088 - gnunet/src/core
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20088 - gnunet/src/core |
Date: |
Mon, 27 Feb 2012 23:19:40 +0100 |
Author: grothoff
Date: 2012-02-27 23:19:40 +0100 (Mon, 27 Feb 2012)
New Revision: 20088
Modified:
gnunet/src/core/gnunet-service-core_kx.c
Log:
-fixing bogus assertion and improving error handling
Modified: gnunet/src/core/gnunet-service-core_kx.c
===================================================================
--- gnunet/src/core/gnunet-service-core_kx.c 2012-02-27 20:00:08 UTC (rev
20087)
+++ gnunet/src/core/gnunet-service-core_kx.c 2012-02-27 22:19:40 UTC (rev
20088)
@@ -603,6 +603,9 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Error in communication with PEERINFO service\n"));
kx->pitr = NULL;
+ kx->retry_set_key_task =
+ GNUNET_SCHEDULER_add_delayed (kx->set_key_retry_frequency,
+ &set_key_retry_task, kx);
return;
}
if (peer == NULL)
@@ -1155,9 +1158,11 @@
GNUNET_NO);
kx->status = KX_STATE_UP;
GSC_SESSIONS_create (&kx->peer, kx);
- GNUNET_assert (kx->retry_set_key_task != GNUNET_SCHEDULER_NO_TASK);
- GNUNET_SCHEDULER_cancel (kx->retry_set_key_task);
- kx->retry_set_key_task = GNUNET_SCHEDULER_NO_TASK;
+ if (GNUNET_SCHEDULER_NO_TASK != kx->retry_set_key_task)
+ {
+ GNUNET_SCHEDULER_cancel (kx->retry_set_key_task);
+ kx->retry_set_key_task = GNUNET_SCHEDULER_NO_TASK;
+ }
GNUNET_assert (kx->keep_alive_task == GNUNET_SCHEDULER_NO_TASK);
if (kx->emsg_received != NULL)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20088 - gnunet/src/core,
gnunet <=