[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10287 - gnunet/src/core
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10287 - gnunet/src/core |
Date: |
Sat, 13 Feb 2010 14:48:15 +0100 |
Author: grothoff
Date: 2010-02-13 14:48:15 +0100 (Sat, 13 Feb 2010)
New Revision: 10287
Modified:
gnunet/src/core/gnunet-service-core.c
Log:
fix
Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c 2010-02-13 13:41:49 UTC (rev
10286)
+++ gnunet/src/core/gnunet-service-core.c 2010-02-13 13:48:15 UTC (rev
10287)
@@ -1588,14 +1588,10 @@
return;
case PEER_STATE_KEY_SENT:
if (n->retry_set_key_task == GNUNET_SCHEDULER_NO_TASK)
- {
- n->retry_set_key_task
- = GNUNET_SCHEDULER_add_delayed (sched,
- n->set_key_retry_frequency,
- &set_key_retry_task, n);
- }
- GNUNET_assert (n->retry_set_key_task !=
- GNUNET_SCHEDULER_NO_TASK);
+ n->retry_set_key_task
+ = GNUNET_SCHEDULER_add_delayed (sched,
+ n->set_key_retry_frequency,
+ &set_key_retry_task, n);
#if DEBUG_CORE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Not yet connected to `%4s', deferring processing of
plaintext messages.\n",
@@ -1603,15 +1599,11 @@
#endif
return;
case PEER_STATE_KEY_RECEIVED:
- if (n->retry_set_key_task == GNUNET_SCHEDULER_NO_TASK)
- {
- n->retry_set_key_task
- = GNUNET_SCHEDULER_add_delayed (sched,
- n->set_key_retry_frequency,
- &set_key_retry_task, n);
- }
- GNUNET_assert (n->retry_set_key_task !=
- GNUNET_SCHEDULER_NO_TASK);
+ if (n->retry_set_key_task == GNUNET_SCHEDULER_NO_TASK)
+ n->retry_set_key_task
+ = GNUNET_SCHEDULER_add_delayed (sched,
+ n->set_key_retry_frequency,
+ &set_key_retry_task, n);
#if DEBUG_CORE
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Not yet connected to `%4s', deferring processing of
plaintext messages.\n",
@@ -1999,12 +1991,17 @@
#endif
n->pitr = NULL;
if (n->public_key != NULL)
- send_key (n);
+ {
+ send_key (n);
+ }
else
- n->retry_set_key_task
- = GNUNET_SCHEDULER_add_delayed (sched,
- n->set_key_retry_frequency,
- &set_key_retry_task, n);
+ {
+ if (GNUNET_SCHEDULER_NO_TASK == n->retry_set_key_task)
+ n->retry_set_key_task
+ = GNUNET_SCHEDULER_add_delayed (sched,
+ n->set_key_retry_frequency,
+ &set_key_retry_task, n);
+ }
return;
}
@@ -2177,14 +2174,12 @@
#endif
/* trigger queue processing */
process_encrypted_neighbour_queue (n);
- if (n->status != PEER_STATE_KEY_CONFIRMED)
- {
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == n->retry_set_key_task);
- n->retry_set_key_task
- = GNUNET_SCHEDULER_add_delayed (sched,
- n->set_key_retry_frequency,
- &set_key_retry_task, n);
- }
+ if ( (n->status != PEER_STATE_KEY_CONFIRMED) &&
+ (GNUNET_SCHEDULER_NO_TASK == n->retry_set_key_task) )
+ n->retry_set_key_task
+ = GNUNET_SCHEDULER_add_delayed (sched,
+ n->set_key_retry_frequency,
+ &set_key_retry_task, n);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10287 - gnunet/src/core,
gnunet <=