diff options
| author | David Goulet <dgoulet@ev0ke.net> | 2015-01-29 12:52:18 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@ev0ke.net> | 2015-01-29 12:55:19 -0500 |
| commit | 80bed1ac96a3035f8c55ddced5528f0d7d16d386 (patch) | |
| tree | 95c0b264156c7c6159fb7bb2d302425dd3c39448 | |
| parent | a3de2dfde6a92c0fe7ca755aa7bc1aa046c463a8 (diff) | |
| download | tor-80bed1ac96a3035f8c55ddced5528f0d7d16d386.tar.gz tor-80bed1ac96a3035f8c55ddced5528f0d7d16d386.zip | |
Remove obsolete workaround in dirserv_thinks_router_is_hs_dir()
Fixes #14202
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
| -rw-r--r-- | changes/bug14202 | 3 | ||||
| -rw-r--r-- | 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 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)); } |