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

Remove redundant descriptor checks for OR/Dir reachability

Browse source 
The ORPort and DirPort must be reachable, or we won't publish a
descriptor.
This commit is contained in:
teor (Tim Wilson-Brown) 2016-04-28 11:36:27 +10:00
parent b51316c0e7
commit 211e56ad87
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/or/router.c
View file

@ -1247,9 +1247,6 @@ decide_to_advertise_dirport(const or_options_t *options, uint16_t dir_port)
return dir_port; return dir_port;
if (net_is_disabled()) if (net_is_disabled())
return 0; return 0;
/* redundant - if DirPort is unreachable, we don't publish a descriptor */
if (!check_whether_dirport_reachable())
return 0;
if (!router_get_advertised_dir_port(options, dir_port)) if (!router_get_advertised_dir_port(options, dir_port))
return 0; return 0;
@ -1280,9 +1277,6 @@ decide_to_advertise_begindir(const or_options_t *options,
return 1; return 1;
if (net_is_disabled()) if (net_is_disabled())
return 0; return 0;
/* redundant - if ORPort is unreachable, we don't publish a descriptor */
if (!check_whether_orport_reachable())
return 0;
if (!router_get_advertised_or_port(options)) if (!router_get_advertised_or_port(options))
return 0; return 0;