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/rephist.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/rephist.c')
| -rw-r--r-- | src/or/rephist.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index fe0ca91c25..04ed7aef0f 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1867,14 +1867,17 @@ any_predicted_circuits(time_t now) int rep_hist_circbuilding_dormant(time_t now) { + const or_options_t *options = get_options(); + if (any_predicted_circuits(now)) return 0; /* see if we'll still need to build testing circuits */ - if (server_mode(get_options()) && - (!check_whether_orport_reachable() || !circuit_enough_testing_circs())) + if (server_mode(options) && + (!check_whether_orport_reachable(options) || + !circuit_enough_testing_circs())) return 0; - if (!check_whether_dirport_reachable()) + if (!check_whether_dirport_reachable(options)) return 0; return 1; |