diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-01-21 16:54:53 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-01-21 16:54:53 +0000 |
commit | ab9f06e97938248d8e3af9a6df00725ce25b43c9 (patch) | |
tree | 9fbd26c2a764e8bed095d9616611f3d76655c28d /src | |
parent | 3513fd310fa5642b99bff02f3535f9540c2e61a0 (diff) | |
download | gnunet-ab9f06e97938248d8e3af9a6df00725ce25b43c9.tar.gz gnunet-ab9f06e97938248d8e3af9a6df00725ce25b43c9.zip |
allow 0 settle time
Diffstat (limited to 'src')
-rw-r--r-- | src/dht/gnunet-dht-driver.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/dht/gnunet-dht-driver.c b/src/dht/gnunet-dht-driver.c index 354d18c03..27e2c2c2f 100644 --- a/src/dht/gnunet-dht-driver.c +++ b/src/dht/gnunet-dht-driver.c | |||
@@ -2265,7 +2265,7 @@ continue_puts_and_gets (void *cls, const struct GNUNET_SCHEDULER_TaskContext * t | |||
2265 | } | 2265 | } |
2266 | #endif | 2266 | #endif |
2267 | 2267 | ||
2268 | if (GNUNET_YES == do_find_peer) | 2268 | if ((GNUNET_YES == do_find_peer) && (settle_time > 0)) |
2269 | { | 2269 | { |
2270 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling find peer requests during \"settle\" time.\n"); | 2270 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Scheduling find peer requests during \"settle\" time.\n"); |
2271 | find_peer_context = GNUNET_malloc(sizeof(struct FindPeerContext)); | 2271 | find_peer_context = GNUNET_malloc(sizeof(struct FindPeerContext)); |
@@ -2537,7 +2537,7 @@ topology_callback (void *cls, | |||
2537 | 2537 | ||
2538 | GNUNET_SCHEDULER_cancel (die_task); | 2538 | GNUNET_SCHEDULER_cancel (die_task); |
2539 | 2539 | ||
2540 | if ((dhtlog_handle != NULL) && (settle_time > 0)) | 2540 | if (dhtlog_handle != NULL) |
2541 | { | 2541 | { |
2542 | topo_ctx = GNUNET_malloc(sizeof(struct TopologyIteratorContext)); | 2542 | topo_ctx = GNUNET_malloc(sizeof(struct TopologyIteratorContext)); |
2543 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Setting continue gets and puts as topo_cont\n"); | 2543 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Setting continue gets and puts as topo_cont\n"); |
@@ -2546,7 +2546,10 @@ topology_callback (void *cls, | |||
2546 | GNUNET_SCHEDULER_add_now(&capture_current_topology, topo_ctx); | 2546 | GNUNET_SCHEDULER_add_now(&capture_current_topology, topo_ctx); |
2547 | } | 2547 | } |
2548 | else | 2548 | else |
2549 | 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); | 2549 | { |
2550 | 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); | ||
2551 | GNUNET_SCHEDULER_add_now(&continue_puts_and_gets, NULL); | ||
2552 | } | ||
2550 | } | 2553 | } |
2551 | else if (total_connections + failed_connections == expected_connections) | 2554 | else if (total_connections + failed_connections == expected_connections) |
2552 | { | 2555 | { |