if dirservers set assumereachable, it overrides their individual

reachability testing


svn:r4851
This commit is contained in:
Roger Dingledine 2005-08-26 20:08:12 +00:00
parent 61f728f4fe
commit f3bccdce73

View File

@ -587,7 +587,8 @@ list_server_status(smartlist_t *routers, char **router_status_out)
if (router_is_me(ri) && !we_are_hibernating()) {
is_live = 1;
} else if (conn && conn->state == OR_CONN_STATE_OPEN) {
is_live = now < ri->last_reachable + REACHABLE_TIMEOUT;
is_live = get_options()->AssumeReachable ||
now < ri->last_reachable + REACHABLE_TIMEOUT;
}
} else {
is_live = ri->is_running;