gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: gnunet
Subject: [GNUnet-SVN] r14224 - gnunet/src/dht
Date: Fri, 21 Jan 2011 17:54:53 +0100

Author: nevans
Date: 2011-01-21 17:54:53 +0100 (Fri, 21 Jan 2011)
New Revision: 14224

Modified:
   gnunet/src/dht/gnunet-dht-driver.c
Log:
allow 0 settle time

Modified: gnunet/src/dht/gnunet-dht-driver.c
===================================================================
--- gnunet/src/dht/gnunet-dht-driver.c  2011-01-21 16:24:07 UTC (rev 14223)
+++ gnunet/src/dht/gnunet-dht-driver.c  2011-01-21 16:54:53 UTC (rev 14224)
@@ -2265,7 +2265,7 @@
     }
 #endif
 
-  if (GNUNET_YES == do_find_peer)
+  if ((GNUNET_YES == do_find_peer) && (settle_time > 0))
     {
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling find peer requests 
during \"settle\" time.\n");
       find_peer_context = GNUNET_malloc(sizeof(struct FindPeerContext));
@@ -2537,7 +2537,7 @@
 
       GNUNET_SCHEDULER_cancel (die_task);
 
-      if ((dhtlog_handle != NULL) && (settle_time > 0))
+      if (dhtlog_handle != NULL)
         {
           topo_ctx = GNUNET_malloc(sizeof(struct TopologyIteratorContext));
           GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Setting continue gets and 
puts as topo_cont\n");
@@ -2546,7 +2546,10 @@
           GNUNET_SCHEDULER_add_now(&capture_current_topology, topo_ctx);
         }
       else
-        GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "For some reason, NOT scheduling 
final topology capture (settle_time %d, dhtlog_handle %s)!\n", settle_time, 
dhtlog_handle);
+        {
+          GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "For some reason, NOT 
scheduling final topology capture (settle_time %d, dhtlog_handle %s)!\n", 
settle_time, dhtlog_handle);
+          GNUNET_SCHEDULER_add_now(&continue_puts_and_gets, NULL);
+        }
     }
   else if (total_connections + failed_connections == expected_connections)
     {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]