tor

commit 26c2e843f958c5451c836bbf9a4979aecac177c4
parent 03c686563b54bbdf1337cb047b2b6002c5a1a549
Author: Alexander Færøy <ahf@torproject.org>
Date:   Mon, 22 Feb 2021 19:12:53 +0000

Merge remote-tracking branch 'tor-gitlab/mr/309' into maint-0.4.5

Diffstat:
A
changes/bug40287
 | 
4
++++
M
src/feature/relay/selftest.c
 | 
4
++++

2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/changes/bug40287 b/changes/bug40287
@@ -0,0 +1,4 @@
+  o Minor bugfixes (directory authority):
+    - Now that exit relays don't allow exit connections to directory authority
+      DirPorts (network reentry), disable authorities' reachability self test
+      on the DirPort. Fixes bug 40287; bugfix on 0.4.5.5-rc.
diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c
@@ -31,6 +31,8 @@
 
 #include "feature/control/control_events.h"
 
+#include "feature/dirauth/authmode.h"
+
 #include "feature/dirclient/dirclient.h"
 #include "feature/dircommon/directory.h"
 
@@ -142,12 +144,14 @@ router_orport_seems_reachable(const or_options_t *options,
  *   - we've seen a successful reachability check, or
  *   - there is no DirPort set, or
  *   - AssumeReachable is set, or
+ *   - We're a dir auth (see ticket #40287), or
  *   - the network is disabled.
  */
 int
 router_dirport_seems_reachable(const or_options_t *options)
 {
   int reach_checks_disabled = router_reachability_checks_disabled(options) ||
+                              authdir_mode(options) ||
                               !options->DirPort_set;
   return reach_checks_disabled ||
          can_reach_dir_port;