diff options
author | David Goulet <dgoulet@torproject.org> | 2021-02-17 11:00:14 -0500 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2021-02-22 08:52:06 -0500 |
commit | 38649b4f9522d5fc2b186d2a02cefb9abaefc519 (patch) | |
tree | fe48cc31653b7178c3566e28786c2c9ea565f075 /src/core | |
parent | c0589d06be698ea864e2c58e40ffda0f228440d4 (diff) | |
download | tor-38649b4f9522d5fc2b186d2a02cefb9abaefc519.tar.gz tor-38649b4f9522d5fc2b186d2a02cefb9abaefc519.zip |
relay: Remove dirport reachability self test
Regular relays are about to get their DirPort removed so that reachability
test is not useful anymore
Authorities will still use the DirPort but because network reentry towards
their DirPort is now denied network wide, this test is not useful anymore and
so it should simply be considered reachable at all time.
Part of #40282
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/mainloop/mainloop.c | 2 | ||||
-rw-r--r-- | src/core/or/circuitbuild.c | 2 | ||||
-rw-r--r-- | src/core/or/circuituse.c | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c index ba87e62af7..22e66b954d 100644 --- a/src/core/mainloop/mainloop.c +++ b/src/core/mainloop/mainloop.c @@ -1146,7 +1146,7 @@ directory_info_has_arrived(time_t now, int from_cache, int suppress_logs) if (server_mode(options) && !net_is_disabled() && !from_cache && (have_completed_a_circuit() || !any_predicted_circuits(now))) - router_do_reachability_checks(1, 1); + router_do_reachability_checks(); } /** Perform regular maintenance tasks for a single connection. This diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 03af7e3e82..fa06d9c7a0 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1069,7 +1069,7 @@ circuit_build_no_more_hops(origin_circuit_t *circ) clear_broken_connection_map(1); if (server_mode(options) && !router_all_orports_seem_reachable(options)) { - router_do_reachability_checks(1, 1); + router_do_reachability_checks(); } } diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index b00d24407a..a49d4b8889 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -1647,8 +1647,9 @@ circuit_testing_opened(origin_circuit_t *circ) } else if (circuit_enough_testing_circs()) { router_perform_bandwidth_test(NUM_PARALLEL_TESTING_CIRCS, time(NULL)); have_performed_bandwidth_test = 1; - } else - router_do_reachability_checks(1, 0); + } else { + router_do_reachability_checks(); + } } /** A testing circuit has failed to build. Take whatever stats we want. */ |