diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-03-03 08:33:03 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-03-03 08:33:03 +0000 |
commit | 9b4bc8e6b28cd3c3b560d3ac085d9bb22d2dd8dc (patch) | |
tree | 95c1646396cc41640d77cd133e8af7e46115a236 /src/core | |
parent | 6145ab509a3036b17f350b0dc2c0e2c6edd9c96b (diff) | |
download | gnunet-9b4bc8e6b28cd3c3b560d3ac085d9bb22d2dd8dc.tar.gz gnunet-9b4bc8e6b28cd3c3b560d3ac085d9bb22d2dd8dc.zip |
-fix
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/gnunet-service-core_kx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index d5e8a20d4..19fbfb182 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c | |||
@@ -618,6 +618,7 @@ set_key_retry_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
618 | 618 | ||
619 | kx->retry_set_key_task = GNUNET_SCHEDULER_NO_TASK; | 619 | kx->retry_set_key_task = GNUNET_SCHEDULER_NO_TASK; |
620 | kx->set_key_retry_frequency = GNUNET_TIME_STD_BACKOFF (kx->set_key_retry_frequency); | 620 | kx->set_key_retry_frequency = GNUNET_TIME_STD_BACKOFF (kx->set_key_retry_frequency); |
621 | GNUNET_assert (KX_STATE_DOWN != kx->status); | ||
621 | send_key (kx); | 622 | send_key (kx); |
622 | } | 623 | } |
623 | 624 | ||
@@ -834,10 +835,10 @@ GSC_KX_handle_ephemeral_key (struct GSC_KeyExchangeInfo *kx, | |||
834 | switch (sender_status) | 835 | switch (sender_status) |
835 | { | 836 | { |
836 | case KX_STATE_DOWN: | 837 | case KX_STATE_DOWN: |
837 | /* makes no sense, should be at least KX_STATE_KEY_SENT */ | ||
838 | GNUNET_break_op (0); | 838 | GNUNET_break_op (0); |
839 | break; | 839 | break; |
840 | case KX_STATE_KEY_SENT: | 840 | case KX_STATE_KEY_SENT: |
841 | kx->status = KX_STATE_KEY_RECEIVED; | ||
841 | send_key (kx); | 842 | send_key (kx); |
842 | break; | 843 | break; |
843 | case KX_STATE_KEY_RECEIVED: | 844 | case KX_STATE_KEY_RECEIVED: |
@@ -1162,6 +1163,7 @@ GSC_KX_handle_pong (struct GSC_KeyExchangeInfo *kx, | |||
1162 | static void | 1163 | static void |
1163 | send_key (struct GSC_KeyExchangeInfo *kx) | 1164 | send_key (struct GSC_KeyExchangeInfo *kx) |
1164 | { | 1165 | { |
1166 | GNUNET_assert (KX_STATE_DOWN != kx->status); | ||
1165 | if (GNUNET_SCHEDULER_NO_TASK != kx->retry_set_key_task) | 1167 | if (GNUNET_SCHEDULER_NO_TASK != kx->retry_set_key_task) |
1166 | { | 1168 | { |
1167 | GNUNET_SCHEDULER_cancel (kx->retry_set_key_task); | 1169 | GNUNET_SCHEDULER_cancel (kx->retry_set_key_task); |