浏览代码

Avoid checking ORPort reachability when the network is disabled

This is consistent with existing DirPort reachability checks.
teor (Tim Wilson-Brown) 9 年之前
父节点
当前提交
d3c60f2bd7
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 3 2
      changes/bug18616
  2. 1 0
      src/or/router.c

+ 3 - 2
changes/bug18616

@@ -1,7 +1,8 @@
   o Major bugfixes (directory mirrors):
   o Major bugfixes (directory mirrors):
     - Fix broken DirPort self-checks. Decide to advertise begindir
     - Fix broken DirPort self-checks. Decide to advertise begindir
       support the same way we decide to advertise DirPorts.
       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
       Resolves #18616, bugfix on 0c8e042c30946faa in #12538 in
       0.2.8.1-alpha. Patch by "teor".
       0.2.8.1-alpha. Patch by "teor".

+ 1 - 0
src/or/router.c

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