diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-06-17 10:03:36 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-06-17 10:03:36 +0000 |
commit | 4635febe06869734d07a30fa308c7e2cd87c3ef9 (patch) | |
tree | d4bc19a97f9b60fa10a9f535515e212244b5ce83 /src/core/gnunet-service-core.c | |
parent | b4a9f96a8bce812208307656ce87fddeb6b1be8a (diff) | |
download | gnunet-4635febe06869734d07a30fa308c7e2cd87c3ef9.tar.gz gnunet-4635febe06869734d07a30fa308c7e2cd87c3ef9.zip |
fix 1698
Diffstat (limited to 'src/core/gnunet-service-core.c')
-rw-r--r-- | src/core/gnunet-service-core.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 19758c5b3..a7f6f8939 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c | |||
@@ -2030,6 +2030,11 @@ process_encrypted_neighbour_queue (struct Neighbour *n) | |||
2030 | 2030 | ||
2031 | if (n->th != NULL) | 2031 | if (n->th != NULL) |
2032 | return; /* request already pending */ | 2032 | return; /* request already pending */ |
2033 | if (GNUNET_YES != n->is_connected) | ||
2034 | { | ||
2035 | GNUNET_break (0); | ||
2036 | return; | ||
2037 | } | ||
2033 | m = n->encrypted_head; | 2038 | m = n->encrypted_head; |
2034 | if (m == NULL) | 2039 | if (m == NULL) |
2035 | { | 2040 | { |
@@ -4522,6 +4527,11 @@ handle_transport_notify_disconnect (void *cls, | |||
4522 | GNUNET_TRANSPORT_notify_transmit_ready_cancel (n->th); | 4527 | GNUNET_TRANSPORT_notify_transmit_ready_cancel (n->th); |
4523 | n->th = NULL; | 4528 | n->th = NULL; |
4524 | } | 4529 | } |
4530 | if (GNUNET_SCHEDULER_NO_TASK != n->keep_alive_task) | ||
4531 | { | ||
4532 | GNUNET_SCHEDULER_cancel (n->keep_alive_task); | ||
4533 | n->keep_alive_task = GNUNET_SCHEDULER_NO_TASK; | ||
4534 | } | ||
4525 | n->is_connected = GNUNET_NO; | 4535 | n->is_connected = GNUNET_NO; |
4526 | n->status = PEER_STATE_DOWN; | 4536 | n->status = PEER_STATE_DOWN; |
4527 | while (NULL != (car = n->active_client_request_head)) | 4537 | while (NULL != (car = n->active_client_request_head)) |