mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

A router must be a dir cache before it may be HSDir

Browse source 
Fixes #15801
This commit is contained in:
Matthew Finkel 2015-05-25 23:09:33 +00:00 • committed by Nick Mathewson
parent 3007de8efc
commit fb80a748ea
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/or/dirserv.c
View file

@ -1350,8 +1350,9 @@ dirserv_thinks_router_is_unreliable(time_t now,
} }
/** Return true iff <b>router</b> should be assigned the "HSDir" flag. /** Return true iff <b>router</b> should be assigned the "HSDir" flag.
*
* Right now this means it advertises support for it, it has a high uptime, * Right now this means it advertises support for it, it has a high uptime,
* it has a DirPort open, it has the Stable and Fast flag and it's currently * it's a directory cache, it has the Stable and Fast flags, and it's currently
* considered Running. * considered Running.
* *
* This function needs to be called after router-\>is_running has * This function needs to be called after router-\>is_running has
@ -1378,7 +1379,8 @@ dirserv_thinks_router_is_hs_dir(const routerinfo_t *router,
else else
uptime = real_uptime(router, now); uptime = real_uptime(router, now);
return (router->wants_to_be_hs_dir && router->dir_port && return (router->wants_to_be_hs_dir &&
router->supports_tunnelled_dir_requests &&
node->is_stable && node->is_fast && node->is_stable && node->is_fast &&
uptime >= get_options()->MinUptimeHidServDirectoryV2 && uptime >= get_options()->MinUptimeHidServDirectoryV2 &&
router_is_active(router, node, now)); router_is_active(router, node, now));

3
src/or/routerlist.c
View file

@ -4905,7 +4905,8 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2)
strcasecmp(r1->contact_info, r2->contact_info)) || strcasecmp(r1->contact_info, r2->contact_info)) ||
r1->is_hibernating != r2->is_hibernating || r1->is_hibernating != r2->is_hibernating ||
cmp_addr_policies(r1->exit_policy, r2->exit_policy) || cmp_addr_policies(r1->exit_policy, r2->exit_policy) ||
r1->dir_cache != r2->dir_cache) (r1->supports_tunnelled_dir_requests !=
r2->supports_tunnelled_dir_requests))
return 0; return 0;
if ((r1->declared_family == NULL) != (r2->declared_family == NULL)) if ((r1->declared_family == NULL) != (r2->declared_family == NULL))
return 0; return 0;