summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-03-13 01:59:09 +0000
committerRoger Dingledine <arma@torproject.org>2007-03-13 01:59:09 +0000
commitbf3b3a44f38b53b948e8ae148359edd690ee4c24 (patch)
tree13e8ab4fc7a60637c82dbfef5b1de820b3d68221 /src
parenta70be61dd51506755184374cd6b3c78c45296d8f (diff)
downloadtor-bf3b3a44f38b53b948e8ae148359edd690ee4c24.tar.gz
tor-bf3b3a44f38b53b948e8ae148359edd690ee4c24.zip
Stop allowing hibernating servers to be "stable" or "fast".
This is what I meant to do in r9690 but didn't actually do. svn:r9808
Diffstat (limited to 'src')
-rw-r--r--src/or/dirserv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index cc85d090f6..3e7dad01c4 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1629,9 +1629,11 @@ generate_v2_networkstatus(void)
tor_version_as_new_as(ri->platform,"0.1.1.10-alpha") &&
!tor_version_as_new_as(ri->platform,"0.1.1.16-rc-cvs");
int f_stable = ri->is_stable =
+ router_is_active(ri, now) &&
!dirserv_thinks_router_is_unreliable(now, ri, 1, 0) &&
!unstable_version;
int f_fast = ri->is_fast =
+ router_is_active(ri, now) &&
!dirserv_thinks_router_is_unreliable(now, ri, 0, 1);
int f_running = ri->is_running; /* computed above */
int f_authority = router_digest_is_trusted_dir(