From d640e2ab008634e236da6fc775852df6bc499e9a Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 29 Dec 2008 20:17:18 +0000 Subject: Spec compliance: if weighted MTBF of a router is at least 5 days, always vote it as Stable. svn:r17821 --- src/or/dirserv.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 8a7f2e9154..85bbee4ee1 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1625,7 +1625,6 @@ should_generate_v2_networkstatus(void) #define UPTIME_TO_GUARANTEE_STABLE (3600*24*30) /** If a router's MTBF is at least this value, then it is always stable. * See above. (Corresponds to about 7 days for current decay rates.) */ -/*XXXX021 Never actually used! */ #define MTBF_TO_GUARANTEE_STABLE (60*60*24*5) /** Similarly, we protect sufficiently fast nodes from being pushed * out of the set of Fast nodes. */ @@ -1695,7 +1694,7 @@ dirserv_thinks_router_is_unreliable(time_t now, { if (need_uptime) { if (!enough_mtbf_info) { - /* XXX021 Once most authorities are on v3, we should change the rule from + /* XXX022 Once most authorities are on v3, we should change the rule from * "use uptime if we don't have mtbf data" to "don't advertise Stable on * v3 if we don't have enough mtbf data." */ long uptime = real_uptime(router, now); @@ -1705,7 +1704,8 @@ dirserv_thinks_router_is_unreliable(time_t now, } else { double mtbf = rep_hist_get_stability(router->cache_info.identity_digest, now); - if (mtbf < stable_mtbf) + if (mtbf < stable_mtbf && + mtbf < MTBF_TO_GUARANTEE_STABLE) return 1; } } -- cgit v1.2.3-54-g00ecf