Make HSDir depend on Running/Valid again.

When we removed Running/Valid checks from Fast and Stable in 8712, I
removed them from HSDir too, which apparently wasn't a good idea.

Reverts part of a65e835800.  Fixes bug 16524. Bugfix
on 0.2.7.2-alpha.
This commit is contained in:
Nick Mathewson 2015-08-11 08:38:30 -04:00
parent 81e0fd8360
commit 7ee7149389
2 changed files with 5 additions and 1 deletions

3
changes/bug16524 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (authority):
- Don't assign "HSDir" to a router if it isn't Valid and Running.
Fixes bug 16524; bugfix on 0.2.7.2-alpha.

View File

@ -1373,7 +1373,8 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
return (router->wants_to_be_hs_dir && router->dir_port && return (router->wants_to_be_hs_dir && router->dir_port &&
node->is_stable && node->is_stable &&
uptime >= get_options()->MinUptimeHidServDirectoryV2); uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
router_is_active(router, node, now));
} }
/** Don't consider routers with less bandwidth than this when computing /** Don't consider routers with less bandwidth than this when computing