Avoid checking ORPort reachability when the network is disabled

This is consistent with existing DirPort reachability checks.

diff --git a/changes/bug18616 b/changes/bug18616
index 44695a1bfff90a7c6875c85dc2a980fefd01e680..d760f15adb63bf6deabf88e229a4c68d4ccc6100 100644 (file)
--- a/changes/bug18616
+++ b/changes/bug18616
@@ -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".

diff --git a/src/or/router.c b/src/or/router.c
index 545753c82e3b070b55758f4d360c63c2f13d785d..1083e24f99092f0a20734ed478c97583e4cf4eb9 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -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;
 }