[GNUnet-SVN] r14445 - gnunet/src/dht

[gnunet]

Author: nevans
Date: 2011-02-17 16:13:38 +0100 (Thu, 17 Feb 2011)
New Revision: 14445

Modified:
   gnunet/src/dht/gnunet-dht-driver.c
   gnunet/src/dht/gnunet-service-dht.c
Log:
fix

Modified: gnunet/src/dht/gnunet-dht-driver.c
===================================================================
--- gnunet/src/dht/gnunet-dht-driver.c  2011-02-17 14:46:51 UTC (rev 14444)
+++ gnunet/src/dht/gnunet-dht-driver.c  2011-02-17 15:13:38 UTC (rev 14445)
@@ -2571,6 +2571,7 @@
   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 @@
       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) &&

Modified: gnunet/src/dht/gnunet-service-dht.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht.c 2011-02-17 14:46:51 UTC (rev 14444)
+++ gnunet/src/dht/gnunet-service-dht.c 2011-02-17 15:13:38 UTC (rev 14445)
@@ -1545,15 +1545,16 @@
                                      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
-    }
 
   return new_peer;
 }