Remove obsolete workaround in dirserv_thinks_router_is_hs_dir()

Fixes #14202

Signed-off-by: David Goulet <dgoulet@ev0ke.net>
This commit is contained in:
David Goulet
2015-01-29 12:52:18 -05:00
parent a3de2dfde6
commit 80bed1ac96
2 changed files with 4 additions and 8 deletions
+3
View File
@@ -0,0 +1,3 @@
o Minor cleanup
- Remove workaround in dirserv_thinks_router_is_hs_dir() that was only
for version <= 0.2.2.24 which is now deprecated.
+1 -8
View File
@@ -1305,14 +1305,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
else
uptime = real_uptime(router, now);
/* XXX We shouldn't need to check dir_port, but we do because of
* bug 1693. In the future, once relays set wants_to_be_hs_dir
* correctly, we can revert to only checking dir_port if router's
* version is too old. */
/* XXX Unfortunately, we need to keep checking dir_port until all
* *clients* suffering from bug 2722 are obsolete. The first version
* to fix the bug was 0.2.2.25-alpha. */
return (router->wants_to_be_hs_dir && router->dir_port &&
return (router->wants_to_be_hs_dir &&
uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
router_is_active(router, node, now));
}