Avoid checking ORPort reachability when the network is disabled

This is consistent with existing DirPort reachability checks.
This commit is contained in:
teor (Tim Wilson-Brown) 2016-04-28 11:13:14 +10:00
parent 2cfcf17cfc
commit d3c60f2bd7
2 changed files with 4 additions and 2 deletions

View File

@ -1,7 +1,8 @@
o Major bugfixes (directory mirrors):
- Fix broken DirPort self-checks. Decide to advertise begindir
support the same way we decide to advertise DirPorts.
Include additional config options in the list that might
change the content of a relay's descriptor.
Add additional config options that might change the content of
a relay's descriptor.
Avoid checking ORPort reachability when the network is disabled.
Resolves #18616, bugfix on 0c8e042c30946faa in #12538 in
0.2.8.1-alpha. Patch by "teor".

View File

@ -1085,6 +1085,7 @@ check_whether_orport_reachable(void)
{
const or_options_t *options = get_options();
return options->AssumeReachable ||
net_is_disabled() ||
can_reach_or_port;
}