summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-03-29 03:48:31 +0000
committerRoger Dingledine <arma@torproject.org>2005-03-29 03:48:31 +0000
commit20a8eda31b340740ec4865946d79c201ac9c7f48 (patch)
treefde8e747679b6bea452890e9d31ea9867e1a1a38
parentfddf560254da197b9e4726b6101f358f4b68e7af (diff)
downloadtor-20a8eda31b340740ec4865946d79c201ac9c7f48.tar.gz
tor-20a8eda31b340740ec4865946d79c201ac9c7f48.zip
don't check for reachability, and don't whine about it, while we're
hibernating. svn:r3919
-rw-r--r--src/or/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 60db6b4941..a0ca875567 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -714,7 +714,8 @@ static void run_scheduled_events(time_t now) {
/* also, check religiously for reachability, if it's within the first
* 20 minutes of our uptime. */
if (server_mode(options) &&
- stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT)
+ stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT &&
+ !we_are_hibernating())
consider_testing_reachability();
}
@@ -811,6 +812,7 @@ static void second_elapsed_callback(int fd, short event, void *args)
stats_prev_global_write_bucket = global_write_bucket;
if (server_mode(options) &&
+ !we_are_hibernating() &&
!check_whether_ports_reachable() &&
stats_n_seconds_working / TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT !=
(stats_n_seconds_working+seconds_elapsed) /