From c42d09fc483b38b61b344f01da1a4678a18d337d Mon Sep 17 00:00:00 2001 From: "Nathan S. Evans" Date: Thu, 17 Feb 2011 15:13:38 +0000 Subject: [PATCH] fix --- src/dht/gnunet-dht-driver.c | 3 ++- src/dht/gnunet-service-dht.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dht/gnunet-dht-driver.c b/src/dht/gnunet-dht-driver.c index dd710a21e..907b44c84 100644 --- a/src/dht/gnunet-dht-driver.c +++ b/src/dht/gnunet-dht-driver.c @@ -2571,6 +2571,7 @@ repeat_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext * tc) GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Peer 1 configuration `%s'\n", repeat_connect_peer1->cfgfile); GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Peer 2 configuration `%s'\n", repeat_connect_peer2->cfgfile); + repeat_connect_task = GNUNET_SCHEDULER_NO_TASK; GNUNET_TESTING_daemons_connect(repeat_connect_peer1, repeat_connect_peer2, GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60), @@ -2660,7 +2661,7 @@ topology_callback (void *cls, GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "have %u total_connections, %u failed\n", total_connections, failed_connections); #if ONLY_TESTING /* These conditions likely mean we've entered the death spiral of doom */ - if ((total_connections > 100000) && + if ((total_connections > 20000) && (conns_per_sec_recent < 5.0) && (conns_per_sec_total > 10.0) && (emsg != NULL) && diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c index a1c3c69a0..72cd7e39f 100644 --- a/src/dht/gnunet-service-dht.c +++ b/src/dht/gnunet-service-dht.c @@ -1545,15 +1545,16 @@ add_peer (const struct GNUNET_PeerIdentity *peer, k_buckets[bucket].tail, new_peer); k_buckets[bucket].peers_size++; +#if DO_UPDATE_PREFERENCE if ((GNUNET_CRYPTO_hash_matching_bits (&my_identity.hashPubKey, &peer->hashPubKey) > 0) && (k_buckets[bucket].peers_size <= bucket_size)) { -#if DO_UPDATE_PREFERENCE + new_peer->preference_task = GNUNET_SCHEDULER_add_now (&update_core_preference, new_peer); -#endif } +#endif return new_peer; } -- 2.25.1