Remove redundant descriptor checks for OR/Dir reachability

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

View File

@ -1247,9 +1247,6 @@ decide_to_advertise_dirport(const or_options_t *options, uint16_t dir_port)
return dir_port;
if (net_is_disabled())
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))
return 0;
@ -1280,9 +1277,6 @@ decide_to_advertise_begindir(const or_options_t *options,
return 1;
if (net_is_disabled())
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))
return 0;