nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 21:16:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '40068_maybe'

Browse Source
This commit is contained in:
Nick Mathewson 2020-07-24 15:15:46 -04:00
commit 010387e4bd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/or/circuituse.c
View File

@ -1651,11 +1651,12 @@ static void
circuit_testing_opened(origin_circuit_t *circ) circuit_testing_opened(origin_circuit_t *circ)
{ {
if (have_performed_bandwidth_test || if (have_performed_bandwidth_test ||
!router_all_orports_seem_reachable(get_options())) { !router_orport_seems_reachable(get_options(), AF_INET)) {
/* either we've already done everything we want with testing circuits, /* either we've already done everything we want with testing circuits,
* or this testing circuit became open due to a fluke, e.g. we picked * OR this IPv4 testing circuit became open due to a fluke, e.g. we picked
* a last hop where we already had the connection open due to an * a last hop where we already had the connection open due to a
* outgoing local circuit. */ * outgoing local circuit, OR this is an IPv6 self-test circuit, not
* a bandwidth test circuit. */
circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_AT_ORIGIN); circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_AT_ORIGIN);
} else if (circuit_enough_testing_circs()) { } else if (circuit_enough_testing_circs()) {
router_perform_bandwidth_test(NUM_PARALLEL_TESTING_CIRCS, time(NULL)); router_perform_bandwidth_test(NUM_PARALLEL_TESTING_CIRCS, time(NULL));