diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-15 20:23:23 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-15 20:23:23 -0500 |
| commit | 3ca04aada2916ce6963358007476eccd851e67cc (patch) | |
| tree | 9d4a2f68ea04c2a07f64b1d8c583a8e16db59c50 /src/or/main.c | |
| parent | 3d7bf98d13ffc090e5ba1b918f53668018690dce (diff) | |
| parent | ad06e0b406f5b3dfaa28da0f03ede4b0f850d00f (diff) | |
| download | tor-3ca04aada2916ce6963358007476eccd851e67cc.tar.gz tor-3ca04aada2916ce6963358007476eccd851e67cc.zip | |
Merge remote-tracking branch 'valentecaio/t-25081'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/or/main.c b/src/or/main.c index ba90e6a8bb..5583f370fa 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1095,7 +1095,7 @@ directory_all_unreachable(time_t now) { (void)now; - stats_n_seconds_working=0; /* reset it */ + reset_uptime(); /* reset it */ if (!directory_all_unreachable_cb_event) { directory_all_unreachable_cb_event = @@ -2064,7 +2064,7 @@ check_for_reachability_bw_callback(time_t now, const or_options_t *options) if (server_mode(options) && (have_completed_a_circuit() || !any_predicted_circuits(now)) && !net_is_disabled()) { - if (stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { + if (get_uptime() < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { consider_testing_reachability(1, dirport_reachability_count==0); if (++dirport_reachability_count > 5) dirport_reachability_count = 0; @@ -2321,8 +2321,8 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg) !net_is_disabled() && seconds_elapsed > 0 && have_completed_a_circuit() && - stats_n_seconds_working / TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT != - (stats_n_seconds_working+seconds_elapsed) / + get_uptime() / TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT != + (get_uptime()+seconds_elapsed) / TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { /* every 20 minutes, check and complain if necessary */ const routerinfo_t *me = router_get_my_routerinfo(); @@ -2466,9 +2466,9 @@ ip_address_changed(int at_interface) } } else { if (server) { - if (stats_n_seconds_working > UPTIME_CUTOFF_FOR_NEW_BANDWIDTH_TEST) + if (get_uptime() > UPTIME_CUTOFF_FOR_NEW_BANDWIDTH_TEST) reset_bandwidth_test(); - stats_n_seconds_working = 0; + reset_uptime(); router_reset_reachability(); } } @@ -3006,6 +3006,13 @@ get_uptime,(void)) return stats_n_seconds_working; } +/** Reset Tor's uptime. */ +MOCK_IMPL(void, +reset_uptime,(void)) +{ + stats_n_seconds_working = 0; +} + /** * Write current memory usage information to the log. */ |