diff options
| author | Roger Dingledine <arma@torproject.org> | 2016-05-16 17:43:47 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2016-05-16 17:43:47 -0400 |
| commit | 06031b441eb92f575f0a1c2ac264dc0daee4fbf4 (patch) | |
| tree | 0cac1a1b5e9aa6039674c077ddf51e59be799abd /src/or/circuituse.c | |
| parent | b6ba6afa3727693b18ce3b698f59494aa81fe1cb (diff) | |
| download | tor-06031b441eb92f575f0a1c2ac264dc0daee4fbf4.tar.gz tor-06031b441eb92f575f0a1c2ac264dc0daee4fbf4.zip | |
touchups and refactorings on bug 18616 branch
no behavior changes
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 31003ea095..f96a3b18f1 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1426,7 +1426,7 @@ static void circuit_testing_opened(origin_circuit_t *circ) { if (have_performed_bandwidth_test || - !check_whether_orport_reachable()) { + !check_whether_orport_reachable(get_options())) { /* 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 * a last hop where we already had the connection open due to an @@ -1443,7 +1443,8 @@ circuit_testing_opened(origin_circuit_t *circ) static void circuit_testing_failed(origin_circuit_t *circ, int at_last_hop) { - if (server_mode(get_options()) && check_whether_orport_reachable()) + const or_options_t *options = get_options(); + if (server_mode(options) && check_whether_orport_reachable(options)) return; log_info(LD_GENERAL, |