think harder about my logic

svn:r6806
This commit is contained in:
Roger Dingledine 2006-07-22 07:19:11 +00:00
parent 2d6a4d283b
commit 00aefaab6b
2 changed files with 3 additions and 3 deletions

View File

@ -796,7 +796,7 @@ options_act(or_options_t *old_options)
return -1; return -1;
} }
server_has_changed_ip(); 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(); inform_testing_reachability();
} }
cpuworkers_rotate(); cpuworkers_rotate();

View File

@ -569,7 +569,7 @@ directory_info_has_arrived(time_t now, int from_cache)
} }
if (server_mode(options) && !we_are_hibernating() && !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(); consider_testing_reachability();
} }
@ -833,7 +833,7 @@ run_scheduled_events(time_t now)
/* also, check religiously for reachability, if it's within the first /* also, check religiously for reachability, if it's within the first
* 20 minutes of our uptime. */ * 20 minutes of our uptime. */
if (server_mode(options) && 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 && stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT &&
!we_are_hibernating()) !we_are_hibernating())
consider_testing_reachability(); consider_testing_reachability();