[or-cvs] if dirservers set assumereachable, it overrides their indiv...

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	dirserv.c 
Log Message:
if dirservers set assumereachable, it overrides their individual
reachability testing


Index: dirserv.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- dirserv.c	26 Aug 2005 18:48:13 -0000	1.186
+++ dirserv.c	26 Aug 2005 20:08:12 -0000	1.187
@@ -587,7 +587,8 @@
       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;