From: David Goulet Date: Thu, 29 Jan 2015 17:52:18 +0000 (-0500) Subject: Remove obsolete workaround in dirserv_thinks_router_is_hs_dir() X-Git-Tag: tor-0.2.6.3-alpha~91^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80bed1ac96a3035f8c55ddced5528f0d7d16d386;p=thirdparty%2Ftor.git Remove obsolete workaround in dirserv_thinks_router_is_hs_dir() Fixes #14202 Signed-off-by: David Goulet --- diff --git a/changes/bug14202 b/changes/bug14202 new file mode 100644 index 0000000000..2bb4ba1776 --- /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 b694f8af77..35799242bc 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)); }