diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-08-26 20:08:12 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-08-26 20:08:12 +0000 |
| commit | f3bccdce731251c5ebc9a1b85f5866f9c55efab8 (patch) | |
| tree | b465e348eeda2f6f81d6ee06644f12b899ac1d9c /src | |
| parent | 61f728f4fe1e358ca333528520c5185510e0d60f (diff) | |
| download | tor-f3bccdce731251c5ebc9a1b85f5866f9c55efab8.tar tor-f3bccdce731251c5ebc9a1b85f5866f9c55efab8.tar.gz | |
if dirservers set assumereachable, it overrides their individual
reachability testing
svn:r4851
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/dirserv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 0cd50068f..fb6b3950b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -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; |