commit 80bed1ac96a3035f8c55ddced5528f0d7d16d386 Author: David Goulet <dgoulet@ev0ke.net> Date: Thu Jan 29 12:52:18 2015 -0500 Remove obsolete workaround in dirserv_thinks_router_is_hs_dir() Fixes #14202 Signed-off-by: David Goulet <dgoulet@ev0ke.net> --- changes/bug14202 | 3 +++ src/or/dirserv.c | 9 +-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/changes/bug14202 b/changes/bug14202 new file mode 100644 index 0000000..2bb4ba1 --- /dev/null +++ b/changes/bug14202 @@ -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. diff --git a/src/or/dirserv.c b/src/or/dirserv.c index b694f8a..3579924 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -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)); }