Revert "Remove obsolete workaround in dirserv_thinks_router_is_hs_dir()"

Fixes #15850, part of #15801. Change file is added by this commit. The
original comment in the reverted commit is removed because right now we
*need* a DirPort until #15849 is implemented so no doubt nor confusion there
anymore.

This reverts commit 80bed1ac96.

Signed-off-by: David Goulet <dgoulet@ev0ke.net>
This commit is contained in:
David Goulet 2015-04-28 14:22:49 -04:00
parent 0ac748353a
commit 26c344a563
2 changed files with 5 additions and 1 deletions

4
changes/bug15850 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfix
- Revert commit that made directory authority assign the HSDir flag to
relay without a DirPort which is bad because relay can't handle
BEGIN_DIR cells. Fixes #15850. Bugfix on tor-0.2.6.3-alpha;

View File

@ -1305,7 +1305,7 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
else
uptime = real_uptime(router, now);
return (router->wants_to_be_hs_dir &&
return (router->wants_to_be_hs_dir && router->dir_port &&
uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
router_is_active(router, node, now));
}