diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-07-22 07:19:11 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-07-22 07:19:11 +0000 |
| commit | 8c044bbe3a32dd5485e4a687a9221b93b7a6742b (patch) | |
| tree | 3d1ea4b6f7829e102b6ee008fe08b07b5b3ce02e | |
| parent | a0ca86003e609703209ce08e84a28c71afcd7094 (diff) | |
| download | tor-8c044bbe3a32dd5485e4a687a9221b93b7a6742b.tar.gz tor-8c044bbe3a32dd5485e4a687a9221b93b7a6742b.zip | |
think harder about my logic
svn:r6806
| -rw-r--r-- | trunk/src/or/config.c | 2 | ||||
| -rw-r--r-- | trunk/src/or/main.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/trunk/src/or/config.c b/trunk/src/or/config.c index 9c6577c07a..6f3c4db6b5 100644 --- a/trunk/src/or/config.c +++ b/trunk/src/or/config.c @@ -796,7 +796,7 @@ options_act(or_options_t *old_options) return -1; } server_has_changed_ip(); - if (has_completed_circuit || any_predicted_circuits(time(NULL))) + if (has_completed_circuit || !any_predicted_circuits(time(NULL))) inform_testing_reachability(); } cpuworkers_rotate(); diff --git a/trunk/src/or/main.c b/trunk/src/or/main.c index cb0e74b374..b0795f526b 100644 --- a/trunk/src/or/main.c +++ b/trunk/src/or/main.c @@ -569,7 +569,7 @@ directory_info_has_arrived(time_t now, int from_cache) } if (server_mode(options) && !we_are_hibernating() && !from_cache && - (has_completed_circuit || any_predicted_circuits(now))) + (has_completed_circuit || !any_predicted_circuits(now))) consider_testing_reachability(); } @@ -833,7 +833,7 @@ 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) && - (has_completed_circuit || any_predicted_circuits(now)) && + (has_completed_circuit || !any_predicted_circuits(now)) && stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT && !we_are_hibernating()) consider_testing_reachability(); |