From: Christian Grothoff Date: Mon, 17 Oct 2011 10:59:51 +0000 (+0000) Subject: fix X-Git-Tag: initial-import-from-subversion-38251~16479 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=522e801284ab0a8b39f6e8cc96c0609a0f28e6a8;p=oweals%2Fgnunet.git fix --- diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 31f6de1d8..0a56c85a1 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c @@ -170,7 +170,7 @@ plugin_env_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer, int do_forward; struct GNUNET_TIME_Relative ret; uint16_t type; - + ret = GNUNET_TIME_UNIT_ZERO; if (NULL != message) { diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index f0dca6874..3dc707923 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c @@ -639,7 +639,6 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer, int was_connected; GNUNET_assert (neighbours != NULL); - n = lookup_neighbour (peer); if (NULL == n) { @@ -650,8 +649,9 @@ GST_neighbours_switch_to_address (const struct GNUNET_PeerIdentity *peer, } was_connected = n->is_connected; n->is_connected = GNUNET_YES; - n->keepalive_task = GNUNET_SCHEDULER_add_now (&neighbour_keepalive_task, - n); + if (GNUNET_YES != was_connected) + n->keepalive_task = GNUNET_SCHEDULER_add_now (&neighbour_keepalive_task, + n); #if DEBUG_TRANSPORT GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,