Commit 8a8045c7 authored by Roger Dingledine's avatar Roger Dingledine Committed by David Goulet
Browse files

relay: No longer test dirport reachability for authorities

Now that exit relays don't allow exit connections to directory authority
DirPorts, the follow-up step is to make directory authorities stop doing
DirPort reachability checks.

Fixes #40287

Signed-off-by: David Goulet's avatarDavid Goulet <dgoulet@torproject.org>
parent 336c45f1
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.
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment