diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-06-14 11:47:09 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-06-14 11:47:09 +0000 |
commit | 4d82fe9bd918e5295a03e1cd4d96b6d98cc8dbd9 (patch) | |
tree | 95309df71f91c624e9d18773d15f7d9c5720a705 /src/topology/gnunet-daemon-topology.c | |
parent | c61072f43108dfc14b109278cdebbb4256a969e9 (diff) | |
download | gnunet-4d82fe9bd918e5295a03e1cd4d96b6d98cc8dbd9.tar.gz gnunet-4d82fe9bd918e5295a03e1cd4d96b6d98cc8dbd9.zip |
fixing 1691
Diffstat (limited to 'src/topology/gnunet-daemon-topology.c')
-rw-r--r-- | src/topology/gnunet-daemon-topology.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index bacd78324..7123e930f 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c | |||
@@ -615,6 +615,7 @@ schedule_next_hello (void *cls, | |||
615 | struct GNUNET_TIME_Relative delay; | 615 | struct GNUNET_TIME_Relative delay; |
616 | 616 | ||
617 | pl->hello_delay_task = GNUNET_SCHEDULER_NO_TASK; | 617 | pl->hello_delay_task = GNUNET_SCHEDULER_NO_TASK; |
618 | GNUNET_assert (GNUNET_YES == pl->is_connected); | ||
618 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) | 619 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN)) |
619 | return; /* we're out of here */ | 620 | return; /* we're out of here */ |
620 | if (pl->hello_req != NULL) | 621 | if (pl->hello_req != NULL) |
@@ -817,6 +818,16 @@ disconnect_notify (void *cls, | |||
817 | } | 818 | } |
818 | pos->is_connected = GNUNET_NO; | 819 | pos->is_connected = GNUNET_NO; |
819 | connection_count--; | 820 | connection_count--; |
821 | if (NULL != pos->hello_req) | ||
822 | { | ||
823 | GNUNET_CORE_notify_transmit_ready_cancel (pos->hello_req); | ||
824 | pos->hello_req = NULL; | ||
825 | } | ||
826 | if (GNUNET_SCHEDULER_NO_TASK != pos->hello_delay_task) | ||
827 | { | ||
828 | GNUNET_SCHEDULER_cancel (pos->hello_delay_task); | ||
829 | pos->hello_delay_tas k = GNUNET_SCHEDULER_NO_TASK; | ||
830 | } | ||
820 | GNUNET_STATISTICS_set (stats, | 831 | GNUNET_STATISTICS_set (stats, |
821 | gettext_noop ("# peers connected"), | 832 | gettext_noop ("# peers connected"), |
822 | connection_count, | 833 | connection_count, |