November 2015 - tor-commits - lists.torproject.org

[tor/master] Some unit tests now require that periodic events be initialized.
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit 70f337fdb20f5ce378e1bfb936aa63a40cdcacaa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 17 09:26:50 2015 -0500 Some unit tests now require that periodic events be initialized. --- src/or/main.c | 9 +++++++-- src/or/main.h | 2 ++ src/or/periodic.c | 18 ++++++++++++++---- src/or/periodic.h | 1 + src/test/test.c | 5 +++++ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index afcb313..b63b81e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1352,12 +1352,17 @@ initialize_periodic_events_cb(evutil_socket_t fd, short events, void *data) /** Set up all the members of periodic_events[], and configure them all to be * launched from a callback. */ -static void +STATIC void initialize_periodic_events(void) { tor_assert(periodic_events_initialized == 0); periodic_events_initialized = 1; + int i; + for (i = 0; periodic_events[i].name; ++i) { + periodic_event_setup(&periodic_events[i]); + } + #define NAMED_CALLBACK(name) \ STMT_BEGIN name ## _event = find_periodic_event( #name ); STMT_END @@ -1372,7 +1377,7 @@ initialize_periodic_events(void) &one_second); } -static void +STATIC void teardown_periodic_events(void) { int i; diff --git a/src/or/main.h b/src/or/main.h index 447d3f4..37e93d7 100644 --- a/src/or/main.h +++ b/src/or/main.h @@ -78,6 +78,8 @@ int tor_init(int argc, char **argv); #ifdef MAIN_PRIVATE STATIC void init_connection_lists(void); STATIC void close_closeable_connections(void); +STATIC void initialize_periodic_events(void); +STATIC void teardown_periodic_events(void); #endif #endif diff --git a/src/or/periodic.c b/src/or/periodic.c index e21b1af..109717f 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -78,12 +78,11 @@ periodic_event_reschedule(periodic_event_item_t *event) periodic_event_set_interval(event, 1); } -/** Handles initial dispatch for periodic events. It should happen 1 second - * after the events are created to mimic behaviour before #3199's refactor */ +/** Initializes the libevent backend for a periodic event. */ void -periodic_event_launch(periodic_event_item_t *event) +periodic_event_setup(periodic_event_item_t *event) { - if (event->ev) { /** Already setup? This is a bug */ + if (event->ev) { /* Already setup? This is a bug */ log_err(LD_BUG, "Initial dispatch should only be done once."); tor_assert(0); } @@ -93,6 +92,17 @@ periodic_event_launch(periodic_event_item_t *event) periodic_event_dispatch, event); tor_assert(event->ev); +} + +/** Handles initial dispatch for periodic events. It should happen 1 second + * after the events are created to mimic behaviour before #3199's refactor */ +void +periodic_event_launch(periodic_event_item_t *event) +{ + if (! event->ev) { /* Not setup? This is a bug */ + log_err(LD_BUG, "periodic_event_launch without periodic_event_setup"); + tor_assert(0); + } // Initial dispatch periodic_event_dispatch(-1, EV_TIMEOUT, event); diff --git a/src/or/periodic.h b/src/or/periodic.h index a77f411..bab0c91 100644 --- a/src/or/periodic.h +++ b/src/or/periodic.h @@ -29,6 +29,7 @@ typedef struct periodic_event_item_t { #define END_OF_PERIODIC_EVENTS { NULL, 0, NULL, NULL } void periodic_event_launch(periodic_event_item_t *event); +void periodic_event_setup(periodic_event_item_t *event); void periodic_event_destroy(periodic_event_item_t *event); void periodic_event_reschedule(periodic_event_item_t *event); diff --git a/src/test/test.c b/src/test/test.c index 44171b5..0bc6292 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -28,6 +28,7 @@ #define ROUTER_PRIVATE #define CIRCUITSTATS_PRIVATE #define CIRCUITLIST_PRIVATE +#define MAIN_PRIVATE #define STATEFILE_PRIVATE /* @@ -50,6 +51,7 @@ double fabs(double x); #include "rendcache.h" #include "test.h" #include "torgzip.h" +#include "main.h" #include "memarea.h" #include "onion.h" #include "onion_ntor.h" @@ -317,6 +319,8 @@ test_circuit_timeout(void *arg) int i, runs; double close_ms; (void)arg; + initialize_periodic_events(); + circuit_build_times_init(&initial); circuit_build_times_init(&estimate); circuit_build_times_init(&final); @@ -456,6 +460,7 @@ test_circuit_timeout(void *arg) circuit_build_times_free_timeouts(&estimate); circuit_build_times_free_timeouts(&final); or_state_free(state); + teardown_periodic_events(); } /** Test encoding and parsing of rendezvous service descriptors. */

1 0

[tor/master] Whoops; in this context the EV_TIMEOUT flag is needed
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit b91bd27e6f94e76359097e1ec53494ea5168108d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 17 08:53:16 2015 -0500 Whoops; in this context the EV_TIMEOUT flag is needed --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index 9fc6035..afcb313 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1367,7 +1367,7 @@ initialize_periodic_events(void) NAMED_CALLBACK(check_dns_honesty); struct timeval one_second = { 1, 0 }; - event_base_once(tor_libevent_get_base(), -1, 0, + event_base_once(tor_libevent_get_base(), -1, EV_TIMEOUT, initialize_periodic_events_cb, NULL, &one_second); }

1 0

[tor/master] Merge branch 'bug3199_redux_3'
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit c113d19b53085f0218f892829839817add071576 Merge: 7a940fa 661e5bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 17 08:27:42 2015 -0500 Merge branch 'bug3199_redux_3' src/or/include.am | 2 + src/or/main.c | 892 ++++++++++++++++++++++++++++++++++------------------- src/or/periodic.c | 110 +++++++ src/or/periodic.h | 36 +++ 4 files changed, 721 insertions(+), 319 deletions(-)

1 0

[tor/master] Connect periodic events to main
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit e8b459a2fa93d8f2991e5cbf4512eb88525df544 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 2 10:49:33 2015 -0500 Connect periodic events to main --- src/or/main.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/periodic.h | 1 + 2 files changed, 53 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 74ae91e..0db843f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -44,6 +44,7 @@ #include "nodelist.h" #include "ntmain.h" #include "onion.h" +#include "periodic.h" #include "policies.h" #include "transports.h" #include "relay.h" @@ -1227,6 +1228,13 @@ get_signewnym_epoch(void) return newnym_epoch; } +/** DOCDOC */ +static int periodic_events_initialized = 0; + +static periodic_event_item_t periodic_events[] = { + END_OF_PERIODIC_EVENTS +}; + typedef struct { time_t last_rotated_x509_certificate; time_t check_v3_certificate; @@ -1267,7 +1275,46 @@ static time_to_t time_to = { void reset_all_main_loop_timers(void) { + int i; memset(&time_to, 0, sizeof(time_to)); + for (i = 0; periodic_events[i].name; ++i) { + periodic_event_reschedule(&periodic_events[i]); + } +} + +/** DOCDOC */ +static void +initialize_periodic_events_cb(evutil_socket_t fd, short events, void *data) +{ + (void) fd; + (void) events; + (void) data; + int i; + for (i = 0; periodic_events[i].name; ++i) { + periodic_event_launch(&periodic_events[i]); + } +} + +/** DOCDOC */ +static void +initialize_periodic_events(void) +{ + tor_assert(periodic_events_initialized == 0); + periodic_events_initialized = 1; + + struct timeval one_second = { 1, 0 }; + event_base_once(tor_libevent_get_base(), -1, 0, + initialize_periodic_events_cb, NULL, + &one_second); +} + +static void +teardown_periodic_events(void) +{ + int i; + for (i = 0; periodic_events[i].name; ++i) { + periodic_event_destroy(&periodic_events[i]); + } } /** @@ -2144,6 +2191,10 @@ do_main_loop(void) tor_assert(second_timer); } + if (! periodic_events_initialized) { + initialize_periodic_events(); + } + #ifdef HAVE_SYSTEMD_209 uint64_t watchdog_delay; /* set up systemd watchdog notification. */ @@ -2852,6 +2903,7 @@ tor_free_all(int postfork) smartlist_free(closeable_connection_lst); smartlist_free(active_linked_connection_lst); periodic_timer_free(second_timer); + teardown_periodic_events(); #ifndef USE_BUFFEREVENTS periodic_timer_free(refill_timer); #endif diff --git a/src/or/periodic.h b/src/or/periodic.h index 7d5b1b4..3a73f64 100644 --- a/src/or/periodic.h +++ b/src/or/periodic.h @@ -25,6 +25,7 @@ typedef struct periodic_event_item_t { /** events will get their interval from first execution */ #define PERIODIC_EVENT(fn) { fn##_callback, 0, 0, NULL, #fn } +#define END_OF_PERIODIC_EVENTS { NULL, 0, 0, NULL, NULL } #if 0 /** Refactor test, check the last_action_time was now or (now - delta - 1)

1 0

[tor/master] Infrastructure for replacing global periodic events in main.c
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit fbeff307f7780b26c9645ec7dbd685807add6581 Author: Kevin Butler <haqkrs(a)gmail.com> Date: Mon Nov 2 09:48:18 2015 -0500 Infrastructure for replacing global periodic events in main.c (This is from Kevin's bug3199 patch series; nick extracted it into a new file and changed the interface a little, then did some API tweaks on it.) --- src/or/include.am | 2 + src/or/periodic.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/periodic.h | 54 ++++++++++++++++++++++++ 3 files changed, 174 insertions(+) diff --git a/src/or/include.am b/src/or/include.am index d0e955f..264c4ae 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -63,6 +63,7 @@ LIBTOR_A_SOURCES = \ src/or/onion_fast.c \ src/or/onion_tap.c \ src/or/transports.c \ + src/or/periodic.c \ src/or/policies.c \ src/or/reasons.c \ src/or/relay.c \ @@ -173,6 +174,7 @@ ORHEADERS = \ src/or/onion_tap.h \ src/or/or.h \ src/or/transports.h \ + src/or/periodic.h \ src/or/policies.h \ src/or/reasons.h \ src/or/relay.h \ diff --git a/src/or/periodic.c b/src/or/periodic.c new file mode 100644 index 0000000..6fa1d8a --- /dev/null +++ b/src/or/periodic.c @@ -0,0 +1,118 @@ +/* Copyright (c) 2015, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "or.h" +#include "config.h" +#include "periodic.h" + +static const int MAX_INTERVAL = 10 * 365 * 86400; + +/** DOCDOC */ +static void +periodic_event_set_interval(periodic_event_item_t *event, + time_t next_interval) +{ + /** update the interval time if it's changed */ + if (next_interval != event->interval) { + tor_assert(next_interval < MAX_INTERVAL); + struct timeval tv; + tv.tv_sec = next_interval; + tv.tv_usec = 0; + event->interval = (int)next_interval; + periodic_timer_update_interval(event->timer, &tv); + } +} + +/** Wraps dispatches for periodic events, data will be a pointer to the + * event that needs to be called */ +static void +periodic_event_dispatch(periodic_timer_t *timer, void *data) +{ + periodic_event_item_t *event = data; + tor_assert(timer == event->timer); + + time_t now = time(NULL); + const or_options_t *options = get_options(); + int r = event->fn(now, options); + int next_interval = 0; + + /* update the last run time if action was taken */ + if (r==0) { + log_err(LD_BUG, "Invalid return value for periodic event from %s.", + event->name); + tor_assert(r != 0); + } else if (r > 0) { + event->last_action_time = now; + /* If the event is meant to happen after ten years, that's likely + * a bug, and somebody gave an absolute time rather than an interval. + */ + tor_assert(r < MAX_INTERVAL); + next_interval = r; + } else { + /* no action was taken, it is likely a precondition failed, + * we should reschedule for next second incase the precondition + * passes then */ + next_interval = 1; + } + + periodic_event_set_interval(event, next_interval); + + log_info(LD_GENERAL, "Dispatching %s", event->name); +} + +/** DOCDOC */ +void +periodic_event_reschedule(periodic_event_item_t *event) +{ + periodic_event_set_interval(event, 1); +} + +/** Handles initial dispatch for periodic events. It should happen 1 second + * after the events are created to mimic behaviour before #3199's refactor */ +void +periodic_event_launch(periodic_event_item_t *event) +{ + if (event->timer) { /** Already setup? This is a bug */ + log_err(LD_BUG, "Initial dispatch should only be done once."); + tor_assert(0); + } + + struct timeval interval; + interval.tv_sec = event->interval; + interval.tv_usec = 0; + + periodic_timer_t *timer = periodic_timer_new(tor_libevent_get_base(), + &interval, + periodic_event_dispatch, + event); + tor_assert(timer); + event->timer = timer; + + // Initial dispatch + periodic_event_dispatch(timer, event); +} + +/** DOCDOC */ +void +periodic_event_destroy(periodic_event_item_t *event) +{ + if (!event) + return; + periodic_timer_free(event->timer); + event->timer = 0; + event->interval = 0; + event->last_action_time = 0; +} + +/** DOCDOC */ +void +periodic_event_assert_in_range(periodic_event_item_t *ev, + time_t start, time_t end) +{ + if (ev->last_action_time < start-1 || ev->last_action_time > end) { + log_err(LD_BUG, "[Refactor Bug] Missed an interval in a range," + "Got %lu, wanted %lu <= x <= %lu.", ev->last_action_time, + start, end); + tor_assert(0); + } +} diff --git a/src/or/periodic.h b/src/or/periodic.h new file mode 100644 index 0000000..7d5b1b4 --- /dev/null +++ b/src/or/periodic.h @@ -0,0 +1,54 @@ +/* Copyright (c) 2015, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#ifndef TOR_PERIODIC_H +#define TOR_PERIODIC_H + +/** Callback function for a periodic event to take action. +* The return value influences the next time the function will get called. +* Return -1 to not update last_action_time and be polled again in +* the next second. If a positive value is returned it will update the +* interval time. If the returned value is larger than now then it +* is assumed to be a future time to poll again. */ +typedef int (*periodic_event_helper_t)(time_t now, + const or_options_t *options); + + +/** A single item for the periodic-events-function table. */ +typedef struct periodic_event_item_t { + periodic_event_helper_t fn; /**< The function to run the event */ + int interval; /**< The interval for running the function (In seconds). */ + time_t last_action_time; /**< The last time the function did something */ + periodic_timer_t *timer; /**< Timer object for this event */ + const char *name; /**< Name of the function -- for debug */ +} periodic_event_item_t; + +/** events will get their interval from first execution */ +#define PERIODIC_EVENT(fn) { fn##_callback, 0, 0, NULL, #fn } + +#if 0 +/** Refactor test, check the last_action_time was now or (now - delta - 1) +* It returns an incremented now value and accounts for the current +* implementation's off by one error in it's comparisons. */ +#define INCREMENT_DELTA_AND_TEST(id, now, delta) \ + (now+delta); \ + STMT_BEGIN \ + periodic_event_item_t *ev = &periodic_events[id]; \ + if (ev->last_action_time != now - delta - 1 && \ + ev->last_action_time != now) { \ + log_err(LD_BUG, "[Refactor Bug] Missed an interval " \ + "for %s, Got %lu, wanted %lu or %lu.", ev->name, \ + ev->last_action_time, now, now-delta); \ + tor_assert(0); \ + } \ + STMT_END +#endif + +void periodic_event_assert_in_range(periodic_event_item_t *event, + time_t start, time_t end); +void periodic_event_launch(periodic_event_item_t *event); +void periodic_event_destroy(periodic_event_item_t *event); +void periodic_event_reschedule(periodic_event_item_t *event); + +#endif +

1 0

[tor/master] Turn all of run_scheduled_events() into a bunch of periodic events
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit 9f31908a405acc64a8dbf1910a273190d7e33f48 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 2 14:59:29 2015 -0500 Turn all of run_scheduled_events() into a bunch of periodic events This patch is designed to look good when you see it through 'diff -b': it mostly leaves entries in the same order, and leaves the code unmodified. --- src/or/main.c | 749 ++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 498 insertions(+), 251 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 0db843f..593bf0c 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1231,43 +1231,87 @@ get_signewnym_epoch(void) /** DOCDOC */ static int periodic_events_initialized = 0; +#define CALLBACK(name) \ + static int name ## _callback(time_t, const or_options_t *) +CALLBACK(rotate_onion_key); +CALLBACK(check_ed_keys); +CALLBACK(launch_descriptor_fetches); +CALLBACK(reset_descriptor_failures); +CALLBACK(fetch_bridge_descriptors); +CALLBACK(rotate_x509_certificate); +CALLBACK(add_entropy); +CALLBACK(enable_accounting); +CALLBACK(launch_reachability_tests); +CALLBACK(downrate_stability); +CALLBACK(save_stability); +CALLBACK(check_authority_cert); +CALLBACK(check_expired_networkstatus); +CALLBACK(write_stats_file); +CALLBACK(record_bridge_stats); +CALLBACK(clean_caches); +CALLBACK(rend_cache_failure_clean); +CALLBACK(retry_dns); +CALLBACK(check_descriptor); +CALLBACK(check_for_reachability_bw); +CALLBACK(fetch_networkstatus); +CALLBACK(dirvote_act); +CALLBACK(expire_misc); +CALLBACK(retry_listeners); +CALLBACK(build_circuits); +CALLBACK(expire_old_ciruits_serverside); +CALLBACK(housekeeping); +CALLBACK(check_dns_honesty); +CALLBACK(write_bridge_ns); +CALLBACK(check_fw_helper_app); +CALLBACK(pt_configuration); +CALLBACK(heartbeat); + +#undef CALLBACK +#define CALLBACK(name) PERIODIC_EVENT(name) + static periodic_event_item_t periodic_events[] = { + CALLBACK(rotate_onion_key), + CALLBACK(check_ed_keys), + CALLBACK(launch_descriptor_fetches), + CALLBACK(reset_descriptor_failures), + CALLBACK(fetch_bridge_descriptors), + CALLBACK(rotate_x509_certificate), + CALLBACK(add_entropy), + CALLBACK(enable_accounting), + CALLBACK(launch_reachability_tests), + CALLBACK(downrate_stability), + CALLBACK(save_stability), + CALLBACK(check_authority_cert), + CALLBACK(check_expired_networkstatus), + CALLBACK(write_stats_file), + CALLBACK(record_bridge_stats), + CALLBACK(clean_caches), + CALLBACK(rend_cache_failure_clean), + CALLBACK(retry_dns), + CALLBACK(check_descriptor), + CALLBACK(check_for_reachability_bw), + CALLBACK(fetch_networkstatus), + CALLBACK(dirvote_act), + CALLBACK(expire_misc), + CALLBACK(retry_listeners), + CALLBACK(build_circuits), + CALLBACK(expire_old_ciruits_serverside), + CALLBACK(housekeeping), + CALLBACK(check_dns_honesty), + CALLBACK(write_bridge_ns), + CALLBACK(check_fw_helper_app), + CALLBACK(pt_configuration), + CALLBACK(heartbeat), END_OF_PERIODIC_EVENTS }; +#undef CALLBACK -typedef struct { - time_t last_rotated_x509_certificate; - time_t check_v3_certificate; - time_t check_listeners; - time_t download_networkstatus; - time_t try_getting_descriptors; - time_t reset_descriptor_failures; - time_t add_entropy; - time_t write_bridge_status_file; - time_t downrate_stability; - time_t save_stability; - time_t clean_caches; - time_t recheck_bandwidth; - time_t check_for_expired_networkstatus; - time_t write_stats_files; - time_t write_bridge_stats; - time_t check_port_forwarding; - time_t launch_reachability_tests; - time_t retry_dns_init; - time_t next_heartbeat; - time_t check_descriptor; - /** When do we next launch DNS wildcarding checks? */ - time_t check_for_correct_dns; - /** When do we next make sure our Ed25519 keys aren't about to expire? */ - time_t check_ed_keys; - -} time_to_t; - -static time_to_t time_to = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; +static periodic_event_item_t *check_descriptor_event=NULL; +static periodic_event_item_t *fetch_networkstatus_event=NULL; +static periodic_event_item_t *launch_descriptor_fetches_event=NULL; +static periodic_event_item_t *check_dns_honesty_event=NULL; -/** Reset all the time_to's so we'll do all our actions again as if we +/** Reset all the periodic events so we'll do all our actions again as if we * just started up. * Useful if our clock just moved back a long time from the future, * so we don't wait until that future arrives again before acting. @@ -1276,12 +1320,23 @@ void reset_all_main_loop_timers(void) { int i; - memset(&time_to, 0, sizeof(time_to)); for (i = 0; periodic_events[i].name; ++i) { periodic_event_reschedule(&periodic_events[i]); } } +/**DOCDOC*/ +static periodic_event_item_t * +find_periodic_event(const char *name) +{ + int i; + for (i = 0; periodic_events[i].name; ++i) { + if (strcmp(name, periodic_events[i].name) == 0) + return &periodic_events[i]; + } + return NULL; +} + /** DOCDOC */ static void initialize_periodic_events_cb(evutil_socket_t fd, short events, void *data) @@ -1302,6 +1357,14 @@ initialize_periodic_events(void) tor_assert(periodic_events_initialized == 0); periodic_events_initialized = 1; +#define NAMED_CALLBACK(name) \ + STMT_BEGIN name ## _event = find_periodic_event( #name ); STMT_END + + NAMED_CALLBACK(check_descriptor); + NAMED_CALLBACK(fetch_networkstatus); + NAMED_CALLBACK(launch_descriptor_fetches); + NAMED_CALLBACK(check_dns_honesty); + struct timeval one_second = { 1, 0 }; event_base_once(tor_libevent_get_base(), -1, 0, initialize_periodic_events_cb, NULL, @@ -1325,7 +1388,8 @@ teardown_periodic_events(void) void reschedule_descriptor_update_check(void) { - time_to.check_descriptor = 0; + tor_assert(check_descriptor_event); + periodic_event_reschedule(check_descriptor_event); } /** @@ -1335,8 +1399,22 @@ reschedule_descriptor_update_check(void) void reschedule_directory_downloads(void) { - time_to.download_networkstatus = 0; - time_to.try_getting_descriptors = 0; + tor_assert(fetch_networkstatus_event); + tor_assert(launch_descriptor_fetches_event); + + periodic_event_reschedule(fetch_networkstatus_event); + periodic_event_reschedule(launch_descriptor_fetches_event); +} + +static inline int +safe_timer_diff(time_t now, time_t next) +{ + if (next > now) { + tor_assert(next - now <= INT_MAX); + return (int)(next - now); + } else { + return 1; + } } /** Perform regular maintenance tasks. This function gets run once per @@ -1345,13 +1423,6 @@ reschedule_directory_downloads(void) static void run_scheduled_events(time_t now) { - static int should_init_bridge_stats = 1; - const or_options_t *options = get_options(); - - int is_server = server_mode(options); - int i; - int have_dir_info; - /* 0. See if we've been asked to shut down and our timeout has * expired; or if our bandwidth limits are exhausted and we * should hibernate; or if it's time to wake up from hibernation. @@ -1368,13 +1439,21 @@ run_scheduled_events(time_t now) /* 0c. If we've deferred log messages for the controller, handle them now */ flush_pending_log_callbacks(); +} +static int +rotate_onion_key_callback(time_t now, const or_options_t *options) +{ /* 1a. Every MIN_ONION_KEY_LIFETIME seconds, rotate the onion keys, * shut down and restart all cpuworkers, and update the directory if * necessary. */ - if (is_server && - get_onion_key_set_at()+MIN_ONION_KEY_LIFETIME < now) { + if (server_mode(options)) { + time_t rotation_time = get_onion_key_set_at()+MIN_ONION_KEY_LIFETIME; + if (rotation_time > now) { + return safe_timer_diff(now, rotation_time); + } + log_info(LD_GENERAL,"Rotating onion key."); rotate_onion_key(); cpuworkers_rotate_keyinfo(); @@ -1383,9 +1462,15 @@ run_scheduled_events(time_t now) } if (advertised_server_mode() && !options->DisableNetwork) router_upload_dir_desc_to_dirservers(0); + return MIN_ONION_KEY_LIFETIME; } + return -1; +} - if (is_server && time_to.check_ed_keys < now) { +static int +check_ed_keys_callback(time_t now, const or_options_t *options) +{ + if (server_mode(options)) { if (should_make_new_ed_keys(options, now)) { if (load_ed_keys(options, now) < 0 || generate_ed_link_cert(options, now)) { @@ -1394,200 +1479,275 @@ run_scheduled_events(time_t now) exit(0); } } - time_to.check_ed_keys = now + 30; + return 30; } + return -1; +} - if (!should_delay_dir_fetches(options, NULL) && - time_to.try_getting_descriptors < now) { - update_all_descriptor_downloads(now); - update_extrainfo_downloads(now); - if (router_have_minimum_dir_info()) - time_to.try_getting_descriptors = now + LAZY_DESCRIPTOR_RETRY_INTERVAL; - else - time_to.try_getting_descriptors = now + GREEDY_DESCRIPTOR_RETRY_INTERVAL; - } +static int +launch_descriptor_fetches_callback(time_t now, const or_options_t *options) +{ + if (should_delay_dir_fetches(options, NULL)) + return -1; - if (time_to.reset_descriptor_failures < now) { - router_reset_descriptor_download_failures(); - time_to.reset_descriptor_failures = - now + DESCRIPTOR_FAILURE_RESET_INTERVAL; - } + update_all_descriptor_downloads(now); + update_extrainfo_downloads(now); + if (router_have_minimum_dir_info()) + return LAZY_DESCRIPTOR_RETRY_INTERVAL; + else + return GREEDY_DESCRIPTOR_RETRY_INTERVAL; +} - if (options->UseBridges && !options->DisableNetwork) +static int +reset_descriptor_failures_callback(time_t now, const or_options_t *options) +{ + (void)now; + (void)options; + router_reset_descriptor_download_failures(); + return DESCRIPTOR_FAILURE_RESET_INTERVAL; +} + +static int +fetch_bridge_descriptors_callback(time_t now, const or_options_t *options) +{ + if (options->UseBridges && !options->DisableNetwork) { fetch_bridge_descriptors(options, now); + return 1; + } + return -1; +} + +static int +rotate_x509_certificate_callback(time_t now, const or_options_t *options) +{ + static int first = 1; + (void)now; + (void)options; + if (first) { + first = 0; + return MAX_SSL_KEY_LIFETIME_INTERNAL; + } /* 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our * TLS context. */ - if (!time_to.last_rotated_x509_certificate) - time_to.last_rotated_x509_certificate = now; - if (time_to.last_rotated_x509_certificate + - MAX_SSL_KEY_LIFETIME_INTERNAL < now) { - log_info(LD_GENERAL,"Rotating tls context."); - if (router_initialize_tls_context() < 0) { - log_warn(LD_BUG, "Error reinitializing TLS context"); - /* XXX is it a bug here, that we just keep going? -RD */ - } - time_to.last_rotated_x509_certificate = now; - /* We also make sure to rotate the TLS connections themselves if they've - * been up for too long -- but that's done via is_bad_for_new_circs in - * connection_run_housekeeping() above. */ + log_info(LD_GENERAL,"Rotating tls context."); + if (router_initialize_tls_context() < 0) { + log_warn(LD_BUG, "Error reinitializing TLS context"); + /* XXX is it a bug here, that we just keep going? -RD */ } - if (time_to.add_entropy < now) { - if (time_to.add_entropy) { - /* We already seeded once, so don't die on failure. */ - crypto_seed_rng(); - } -/** How often do we add more entropy to OpenSSL's RNG pool? */ + /* We also make sure to rotate the TLS connections themselves if they've + * been up for too long -- but that's done via is_bad_for_new_circs in + * connection_run_housekeeping() above. */ + + return MAX_SSL_KEY_LIFETIME_INTERNAL; +} + +static int +add_entropy_callback(time_t now, const or_options_t *options) +{ + (void)now; + (void)options; + /* We already seeded once, so don't die on failure. */ + crypto_seed_rng(); + + /** How often do we add more entropy to OpenSSL's RNG pool? */ #define ENTROPY_INTERVAL (60*60) - time_to.add_entropy = now + ENTROPY_INTERVAL; - } + return ENTROPY_INTERVAL; +} +static int +enable_accounting_callback(time_t now, const or_options_t *options) +{ /* 1c. If we have to change the accounting interval or record * bandwidth used in this accounting interval, do so. */ - if (accounting_is_enabled(options)) + if (accounting_is_enabled(options)) { accounting_run_housekeeping(now); + return 1; + } + return -1; +} - if (time_to.launch_reachability_tests < now && - (authdir_mode_tests_reachability(options)) && - !net_is_disabled()) { - time_to.launch_reachability_tests = now + REACHABILITY_TEST_INTERVAL; +static int +launch_reachability_tests_callback(time_t now, const or_options_t *options) +{ + if (authdir_mode_tests_reachability(options) && + !net_is_disabled()) { /* try to determine reachability of the other Tor relays */ dirserv_test_reachability(now); } + return REACHABILITY_TEST_INTERVAL; +} +static int +downrate_stability_callback(time_t now, const or_options_t *options) +{ + (void)options; /* 1d. Periodically, we discount older stability information so that new * stability info counts more, and save the stability information to disk as * appropriate. */ - if (time_to.downrate_stability < now) - time_to.downrate_stability = rep_hist_downrate_old_runs(now); + time_t next = rep_hist_downrate_old_runs(now); + return safe_timer_diff(now, next); +} + +static int +save_stability_callback(time_t now, const or_options_t *options) +{ if (authdir_mode_tests_reachability(options)) { - if (time_to.save_stability < now) { - if (time_to.save_stability && rep_hist_record_mtbf_data(now, 1)<0) { - log_warn(LD_GENERAL, "Couldn't store mtbf data."); - } -#define SAVE_STABILITY_INTERVAL (30*60) - time_to.save_stability = now + SAVE_STABILITY_INTERVAL; + if (rep_hist_record_mtbf_data(now, 1)<0) { + log_warn(LD_GENERAL, "Couldn't store mtbf data."); } } +#define SAVE_STABILITY_INTERVAL (30*60) + return SAVE_STABILITY_INTERVAL; +} +static int +check_authority_cert_callback(time_t now, const or_options_t *options) +{ + (void)now; + (void)options; /* 1e. Periodically, if we're a v3 authority, we check whether our cert is * close to expiring and warn the admin if it is. */ - if (time_to.check_v3_certificate < now) { - v3_authority_check_key_expiry(); + v3_authority_check_key_expiry(); #define CHECK_V3_CERTIFICATE_INTERVAL (5*60) - time_to.check_v3_certificate = now + CHECK_V3_CERTIFICATE_INTERVAL; - } + return CHECK_V3_CERTIFICATE_INTERVAL; +} +static int +check_expired_networkstatus_callback(time_t now, const or_options_t *options) +{ + (void)options; /* 1f. Check whether our networkstatus has expired. */ - if (time_to.check_for_expired_networkstatus < now) { - networkstatus_t *ns = networkstatus_get_latest_consensus(); - /*XXXX RD: This value needs to be the same as REASONABLY_LIVE_TIME in - * networkstatus_get_reasonably_live_consensus(), but that value is way - * way too high. Arma: is the bridge issue there resolved yet? -NM */ + networkstatus_t *ns = networkstatus_get_latest_consensus(); + /*XXXX RD: This value needs to be the same as REASONABLY_LIVE_TIME in + * networkstatus_get_reasonably_live_consensus(), but that value is way + * way too high. Arma: is the bridge issue there resolved yet? -NM */ #define NS_EXPIRY_SLOP (24*60*60) - if (ns && ns->valid_until < now+NS_EXPIRY_SLOP && - router_have_minimum_dir_info()) { - router_dir_info_changed(); - } -#define CHECK_EXPIRED_NS_INTERVAL (2*60) - time_to.check_for_expired_networkstatus = now + CHECK_EXPIRED_NS_INTERVAL; + if (ns && ns->valid_until < now+NS_EXPIRY_SLOP && + router_have_minimum_dir_info()) { + router_dir_info_changed(); } +#define CHECK_EXPIRED_NS_INTERVAL (2*60) + return CHECK_EXPIRED_NS_INTERVAL; +} +static int +write_stats_file_callback(time_t now, const or_options_t *options) +{ /* 1g. Check whether we should write statistics to disk. */ - if (time_to.write_stats_files < now) { #define CHECK_WRITE_STATS_INTERVAL (60*60) - time_t next_time_to_write_stats_files = (time_to.write_stats_files > 0 ? - time_to.write_stats_files : now) + CHECK_WRITE_STATS_INTERVAL; - if (options->CellStatistics) { - time_t next_write = - rep_hist_buffer_stats_write(time_to.write_stats_files); - if (next_write && next_write < next_time_to_write_stats_files) - next_time_to_write_stats_files = next_write; - } - if (options->DirReqStatistics) { - time_t next_write = geoip_dirreq_stats_write(time_to.write_stats_files); - if (next_write && next_write < next_time_to_write_stats_files) - next_time_to_write_stats_files = next_write; - } - if (options->EntryStatistics) { - time_t next_write = geoip_entry_stats_write(time_to.write_stats_files); - if (next_write && next_write < next_time_to_write_stats_files) - next_time_to_write_stats_files = next_write; - } - if (options->HiddenServiceStatistics) { - time_t next_write = rep_hist_hs_stats_write(time_to.write_stats_files); - if (next_write && next_write < next_time_to_write_stats_files) - next_time_to_write_stats_files = next_write; - } - if (options->ExitPortStatistics) { - time_t next_write = rep_hist_exit_stats_write(time_to.write_stats_files); - if (next_write && next_write < next_time_to_write_stats_files) - next_time_to_write_stats_files = next_write; - } - if (options->ConnDirectionStatistics) { - time_t next_write = rep_hist_conn_stats_write(time_to.write_stats_files); - if (next_write && next_write < next_time_to_write_stats_files) - next_time_to_write_stats_files = next_write; - } - if (options->BridgeAuthoritativeDir) { - time_t next_write = rep_hist_desc_stats_write(time_to.write_stats_files); - if (next_write && next_write < next_time_to_write_stats_files) - next_time_to_write_stats_files = next_write; - } - time_to.write_stats_files = next_time_to_write_stats_files; + time_t next_time_to_write_stats_files = now + CHECK_WRITE_STATS_INTERVAL; + if (options->CellStatistics) { + time_t next_write = + rep_hist_buffer_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + if (options->DirReqStatistics) { + time_t next_write = geoip_dirreq_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + if (options->EntryStatistics) { + time_t next_write = geoip_entry_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + if (options->HiddenServiceStatistics) { + time_t next_write = rep_hist_hs_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + if (options->ExitPortStatistics) { + time_t next_write = rep_hist_exit_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + if (options->ConnDirectionStatistics) { + time_t next_write = rep_hist_conn_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; } + if (options->BridgeAuthoritativeDir) { + time_t next_write = rep_hist_desc_stats_write(now); + if (next_write && next_write < next_time_to_write_stats_files) + next_time_to_write_stats_files = next_write; + } + + return safe_timer_diff(now, next_time_to_write_stats_files); +} + +static int +record_bridge_stats_callback(time_t now, const or_options_t *options) +{ + static int should_init_bridge_stats = 1; /* 1h. Check whether we should write bridge statistics to disk. */ if (should_record_bridge_info(options)) { - if (time_to.write_bridge_stats < now) { - if (should_init_bridge_stats) { - /* (Re-)initialize bridge statistics. */ + if (should_init_bridge_stats) { + /* (Re-)initialize bridge statistics. */ geoip_bridge_stats_init(now); - time_to.write_bridge_stats = now + WRITE_STATS_INTERVAL; should_init_bridge_stats = 0; - } else { - /* Possibly write bridge statistics to disk and ask when to write - * them next time. */ - time_to.write_bridge_stats = geoip_bridge_stats_write( - time_to.write_bridge_stats); - } + return WRITE_STATS_INTERVAL; + } else { + /* Possibly write bridge statistics to disk and ask when to write + * them next time. */ + time_t next = geoip_bridge_stats_write(now); + return safe_timer_diff(now, next); } } else if (!should_init_bridge_stats) { /* Bridge mode was turned off. Ensure that stats are re-initialized * next time bridge mode is turned on. */ should_init_bridge_stats = 1; } + return -1; +} +static int +clean_caches_callback(time_t now, const or_options_t *options) +{ /* Remove old information from rephist and the rend cache. */ - if (time_to.clean_caches < now) { - rep_history_clean(now - options->RephistTrackTime); - rend_cache_clean(now, REND_CACHE_TYPE_CLIENT); - rend_cache_clean(now, REND_CACHE_TYPE_SERVICE); - rend_cache_clean_v2_descs_as_dir(now, 0); - microdesc_cache_rebuild(NULL, 0); + rep_history_clean(now - options->RephistTrackTime); + rend_cache_clean(now, REND_CACHE_TYPE_CLIENT); + rend_cache_clean(now, REND_CACHE_TYPE_SERVICE); + rend_cache_clean_v2_descs_as_dir(now, 0); + microdesc_cache_rebuild(NULL, 0); #define CLEAN_CACHES_INTERVAL (30*60) - time_to.clean_caches = now + CLEAN_CACHES_INTERVAL; - } + return CLEAN_CACHES_INTERVAL; +} + +static int +rend_cache_failure_clean_callback(time_t now, const or_options_t *options) +{ + (void)options; /* We don't keep entries that are more than five minutes old so we try to * clean it as soon as we can since we want to make sure the client waits * as little as possible for reachability reasons. */ rend_cache_failure_clean(now); + return 1; +} +static int +retry_dns_callback(time_t now, const or_options_t *options) +{ + (void)now; #define RETRY_DNS_INTERVAL (10*60) /* If we're a server and initializing dns failed, retry periodically. */ - if (time_to.retry_dns_init < now) { - time_to.retry_dns_init = now + RETRY_DNS_INTERVAL; - if (is_server && has_dns_init_failed()) - dns_init(); - } + if (server_mode(options) && has_dns_init_failed()) + dns_init(); + return RETRY_DNS_INTERVAL; +} /* 2. Periodically, we consider force-uploading our descriptor * (if we've passed our internal checks). */ +static int +check_descriptor_callback(time_t now, const or_options_t *options) +{ /** How often do we check whether part of our router info has changed in a * way that would require an upload? That includes checking whether our IP * address has changed. */ @@ -1595,60 +1755,91 @@ run_scheduled_events(time_t now) /* 2b. Once per minute, regenerate and upload the descriptor if the old * one is inaccurate. */ - if (time_to.check_descriptor < now && !options->DisableNetwork) { - static int dirport_reachability_count = 0; - time_to.check_descriptor = now + CHECK_DESCRIPTOR_INTERVAL; + if (!options->DisableNetwork) { check_descriptor_bandwidth_changed(now); check_descriptor_ipaddress_changed(now); mark_my_descriptor_dirty_if_too_old(now); consider_publishable_server(0); - /* also, check religiously for reachability, if it's within the first - * 20 minutes of our uptime. */ - if (is_server && - (have_completed_a_circuit() || !any_predicted_circuits(now)) && - !we_are_hibernating()) { - if (stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { - consider_testing_reachability(1, dirport_reachability_count==0); - if (++dirport_reachability_count > 5) - dirport_reachability_count = 0; - } else if (time_to.recheck_bandwidth < now) { - /* If we haven't checked for 12 hours and our bandwidth estimate is - * low, do another bandwidth test. This is especially important for - * bridges, since they might go long periods without much use. */ - const routerinfo_t *me = router_get_my_routerinfo(); - if (time_to.recheck_bandwidth && me && - me->bandwidthcapacity < me->bandwidthrate && - me->bandwidthcapacity < 51200) { - reset_bandwidth_test(); - } -#define BANDWIDTH_RECHECK_INTERVAL (12*60*60) - time_to.recheck_bandwidth = now + BANDWIDTH_RECHECK_INTERVAL; - } - } - /* If any networkstatus documents are no longer recent, we need to * update all the descriptors' running status. */ /* Remove dead routers. */ + /* XXXX This doesn't belong here, but it was here in the pre- + * XXXX refactoring code. */ routerlist_remove_old_routers(); } + return CHECK_DESCRIPTOR_INTERVAL; +} + +static int +check_for_reachability_bw_callback(time_t now, const or_options_t *options) +{ + /* XXXX This whole thing was stuck in the middle of what is now + * XXXX check_descriptor_callback. I'm not sure it's right. */ + + static int dirport_reachability_count = 0; + /* also, check religiously for reachability, if it's within the first + * 20 minutes of our uptime. */ + if (server_mode(options) && + (have_completed_a_circuit() || !any_predicted_circuits(now)) && + !we_are_hibernating()) { + if (stats_n_seconds_working < TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { + consider_testing_reachability(1, dirport_reachability_count==0); + if (++dirport_reachability_count > 5) + dirport_reachability_count = 0; + return 1; + } else { + /* If we haven't checked for 12 hours and our bandwidth estimate is + * low, do another bandwidth test. This is especially important for + * bridges, since they might go long periods without much use. */ + const routerinfo_t *me = router_get_my_routerinfo(); + static int first_time = 1; + if (!first_time && me && + me->bandwidthcapacity < me->bandwidthrate && + me->bandwidthcapacity < 51200) { + reset_bandwidth_test(); + } + first_time = 0; +#define BANDWIDTH_RECHECK_INTERVAL (12*60*60) + return BANDWIDTH_RECHECK_INTERVAL; + } + } + return CHECK_DESCRIPTOR_INTERVAL; +} + +static int +fetch_networkstatus_callback(time_t now, const or_options_t *options) +{ /* 2c. Every minute (or every second if TestingTorNetwork), check * whether we want to download any networkstatus documents. */ -/* How often do we check whether we should download network status - * documents? */ + /* How often do we check whether we should download network status + * documents? */ #define networkstatus_dl_check_interval(o) ((o)->TestingTorNetwork ? 1 : 60) - if (!should_delay_dir_fetches(options, NULL) && - time_to.download_networkstatus < now) { - time_to.download_networkstatus = - now + networkstatus_dl_check_interval(options); - update_networkstatus_downloads(now); - } + if (should_delay_dir_fetches(options, NULL)) + return -1; + + update_networkstatus_downloads(now); + return networkstatus_dl_check_interval(options); +} +static int +dirvote_act_callback(time_t now, const or_options_t *options) +{ /* 2c. Let directory voting happen. */ - if (authdir_mode_v3(options)) + if (authdir_mode_v3(options)) { dirvote_act(options, now); + return 1; + } + return -1; +} + +static int +expire_misc_callback(time_t now, const or_options_t *options) +{ + (void)now; + (void)options; /* 3a. Every second, we examine pending circuits and prune the * ones which have been pending for more than a few seconds. @@ -1670,28 +1861,54 @@ run_scheduled_events(time_t now) */ connection_expire_held_open(); + return 1; +} + +static int +retry_listeners_callback(time_t now, const or_options_t *options) +{ + (void)now; + (void)options; /* 3d. And every 60 seconds, we relaunch listeners if any died. */ - if (!net_is_disabled() && time_to.check_listeners < now) { + if (!net_is_disabled()) { retry_all_listeners(NULL, NULL, 0); - time_to.check_listeners = now+60; + return 60; } + return -1; +} +static int +build_circuits_callback(time_t now, const or_options_t *options) +{ + (void)options; /* 4. Every second, we try a new circuit if there are no valid * circuits. Every NewCircuitPeriod seconds, we expire circuits * that became dirty more than MaxCircuitDirtiness seconds ago, * and we make a new circ if there are no clean circuits. */ - have_dir_info = router_have_minimum_dir_info(); + const int have_dir_info = router_have_minimum_dir_info(); if (have_dir_info && !net_is_disabled()) { circuit_build_needed_circs(now); } else { circuit_expire_old_circs_as_needed(now); } + return 1; +} - /* every 10 seconds, but not at the same second as other such events */ - if (now % 10 == 5) - circuit_expire_old_circuits_serverside(now); +static int +expire_old_ciruits_serverside_callback(time_t now, const or_options_t *options) +{ + (void)options; + /* every 11 seconds, so not usually the same second as other such events */ + circuit_expire_old_circuits_serverside(now); + return 11; +} +static int +housekeeping_callback(time_t now, const or_options_t *options) +{ + (void)options; + int i; /* 5. We do housekeeping for each connection... */ connection_or_set_bad_connections(NULL, 0); for (i=0;i<smartlist_len(connection_array);i++) { @@ -1721,59 +1938,88 @@ run_scheduled_events(time_t now) channel_run_cleanup(); channel_listener_run_cleanup(); + return 1; +} + +static int +check_dns_honesty_callback(time_t now, const or_options_t *options) +{ + (void)now; /* 9. and if we're an exit node, check whether our DNS is telling stories * to us. */ - if (!net_is_disabled() && - public_server_mode(options) && - time_to.check_for_correct_dns < now && - ! router_my_exit_policy_is_reject_star()) { - if (!time_to.check_for_correct_dns) { - time_to.check_for_correct_dns = - crypto_rand_time_range(now + 60, now + 180); - } else { - dns_launch_correctness_checks(); - time_to.check_for_correct_dns = now + 12*3600 + - crypto_rand_int(12*3600); - } + if (net_is_disabled() || + ! public_server_mode(options) || + router_my_exit_policy_is_reject_star()) + return -1; + + static int first_time = 1; + if (first_time) { + /* Don't launch right when we start */ + first_time = 0; + return crypto_rand_int_range(60, 180); } + dns_launch_correctness_checks(); + return 12*3600 + crypto_rand_int(12*3600); +} + +static int +write_bridge_ns_callback(time_t now, const or_options_t *options) +{ /* 10. write bridge networkstatus file to disk */ - if (options->BridgeAuthoritativeDir && - time_to.write_bridge_status_file < now) { + if (options->BridgeAuthoritativeDir) { networkstatus_dump_bridge_status_to_file(now); #define BRIDGE_STATUSFILE_INTERVAL (30*60) - time_to.write_bridge_status_file = now+BRIDGE_STATUSFILE_INTERVAL; + return BRIDGE_STATUSFILE_INTERVAL; } + return -1; +} +static int +check_fw_helper_app_callback(time_t now, const or_options_t *options) +{ + if (net_is_disabled() || + ! server_mode(options) || + ! options->PortForwarding) { + return -1; + } /* 11. check the port forwarding app */ - if (!net_is_disabled() && - time_to.check_port_forwarding < now && - options->PortForwarding && - is_server) { + #define PORT_FORWARDING_CHECK_INTERVAL 5 - smartlist_t *ports_to_forward = get_list_of_ports_to_forward(); - if (ports_to_forward) { - tor_check_port_forwarding(options->PortForwardingHelper, - ports_to_forward, - now); - - SMARTLIST_FOREACH(ports_to_forward, char *, cp, tor_free(cp)); - smartlist_free(ports_to_forward); - } - time_to.check_port_forwarding = now+PORT_FORWARDING_CHECK_INTERVAL; + smartlist_t *ports_to_forward = get_list_of_ports_to_forward(); + if (ports_to_forward) { + tor_check_port_forwarding(options->PortForwardingHelper, + ports_to_forward, + now); + + SMARTLIST_FOREACH(ports_to_forward, char *, cp, tor_free(cp)); + smartlist_free(ports_to_forward); } + return PORT_FORWARDING_CHECK_INTERVAL; +} +static int +pt_configuration_callback(time_t now, const or_options_t *options) +{ + (void)now; + (void)options; /* 11b. check pending unconfigured managed proxies */ if (!net_is_disabled() && pt_proxies_configuration_pending()) pt_configure_remaining_proxies(); + return 1; +} +static int +heartbeat_callback(time_t now, const or_options_t *options) +{ + static int first = 1; /* 12. write the heartbeat message */ - if (options->HeartbeatPeriod && - time_to.next_heartbeat <= now) { - if (time_to.next_heartbeat) /* don't log the first heartbeat */ - log_heartbeat(now); - time_to.next_heartbeat = now+options->HeartbeatPeriod; + if (first) { + first = 0; + } else { + log_heartbeat(now); } + return options->HeartbeatPeriod; } /** Timer: used to invoke second_elapsed_callback() once per second. */ @@ -1995,7 +2241,8 @@ dns_servers_relaunch_checks(void) { if (server_mode(get_options())) { dns_reset_correctness_checks(); - time_to.check_for_correct_dns = 0; + tor_assert(check_dns_honesty_event); + periodic_event_reschedule(check_dns_honesty_event); } }

1 0

[tor/master] Fold all of the run-every-second stuff back into run_scheduled_events()
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit 2bf8fb5ee3a62cb6c2f16d2f37f54213e092d4cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 2 15:09:48 2015 -0500 Fold all of the run-every-second stuff back into run_scheduled_events() --- src/or/main.c | 228 +++++++++++++++++++++------------------------------------ 1 file changed, 85 insertions(+), 143 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 593bf0c..e0ea856 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1237,10 +1237,8 @@ CALLBACK(rotate_onion_key); CALLBACK(check_ed_keys); CALLBACK(launch_descriptor_fetches); CALLBACK(reset_descriptor_failures); -CALLBACK(fetch_bridge_descriptors); CALLBACK(rotate_x509_certificate); CALLBACK(add_entropy); -CALLBACK(enable_accounting); CALLBACK(launch_reachability_tests); CALLBACK(downrate_stability); CALLBACK(save_stability); @@ -1254,16 +1252,11 @@ CALLBACK(retry_dns); CALLBACK(check_descriptor); CALLBACK(check_for_reachability_bw); CALLBACK(fetch_networkstatus); -CALLBACK(dirvote_act); -CALLBACK(expire_misc); CALLBACK(retry_listeners); -CALLBACK(build_circuits); CALLBACK(expire_old_ciruits_serverside); -CALLBACK(housekeeping); CALLBACK(check_dns_honesty); CALLBACK(write_bridge_ns); CALLBACK(check_fw_helper_app); -CALLBACK(pt_configuration); CALLBACK(heartbeat); #undef CALLBACK @@ -1274,10 +1267,8 @@ static periodic_event_item_t periodic_events[] = { CALLBACK(check_ed_keys), CALLBACK(launch_descriptor_fetches), CALLBACK(reset_descriptor_failures), - CALLBACK(fetch_bridge_descriptors), CALLBACK(rotate_x509_certificate), CALLBACK(add_entropy), - CALLBACK(enable_accounting), CALLBACK(launch_reachability_tests), CALLBACK(downrate_stability), CALLBACK(save_stability), @@ -1291,16 +1282,11 @@ static periodic_event_item_t periodic_events[] = { CALLBACK(check_descriptor), CALLBACK(check_for_reachability_bw), CALLBACK(fetch_networkstatus), - CALLBACK(dirvote_act), - CALLBACK(expire_misc), CALLBACK(retry_listeners), - CALLBACK(build_circuits), CALLBACK(expire_old_ciruits_serverside), - CALLBACK(housekeeping), CALLBACK(check_dns_honesty), CALLBACK(write_bridge_ns), CALLBACK(check_fw_helper_app), - CALLBACK(pt_configuration), CALLBACK(heartbeat), END_OF_PERIODIC_EVENTS }; @@ -1423,6 +1409,8 @@ safe_timer_diff(time_t now, time_t next) static void run_scheduled_events(time_t now) { + const or_options_t *options = get_options(); + /* 0. See if we've been asked to shut down and our timeout has * expired; or if our bandwidth limits are exhausted and we * should hibernate; or if it's time to wake up from hibernation. @@ -1439,6 +1427,85 @@ run_scheduled_events(time_t now) /* 0c. If we've deferred log messages for the controller, handle them now */ flush_pending_log_callbacks(); + + if (options->UseBridges && !options->DisableNetwork) { + fetch_bridge_descriptors(options, now); + } + + if (accounting_is_enabled(options)) { + accounting_run_housekeeping(now); + } + + if (authdir_mode_v3(options)) { + dirvote_act(options, now); + } + + /* 3a. Every second, we examine pending circuits and prune the + * ones which have been pending for more than a few seconds. + * We do this before step 4, so it can try building more if + * it's not comfortable with the number of available circuits. + */ + /* (If our circuit build timeout can ever become lower than a second (which + * it can't, currently), we should do this more often.) */ + circuit_expire_building(); + + /* 3b. Also look at pending streams and prune the ones that 'began' + * a long time ago but haven't gotten a 'connected' yet. + * Do this before step 4, so we can put them back into pending + * state to be picked up by the new circuit. + */ + connection_ap_expire_beginning(); + + /* 3c. And expire connections that we've held open for too long. + */ + connection_expire_held_open(); + + /* 4. Every second, we try a new circuit if there are no valid + * circuits. Every NewCircuitPeriod seconds, we expire circuits + * that became dirty more than MaxCircuitDirtiness seconds ago, + * and we make a new circ if there are no clean circuits. + */ + const int have_dir_info = router_have_minimum_dir_info(); + if (have_dir_info && !net_is_disabled()) { + circuit_build_needed_circs(now); + } else { + circuit_expire_old_circs_as_needed(now); + } + + /* 5. We do housekeeping for each connection... */ + connection_or_set_bad_connections(NULL, 0); + int i; + for (i=0;i<smartlist_len(connection_array);i++) { + run_connection_housekeeping(i, now); + } + + /* 6. And remove any marked circuits... */ + circuit_close_all_marked(); + + /* 7. And upload service descriptors if necessary. */ + if (have_completed_a_circuit() && !net_is_disabled()) { + rend_consider_services_upload(now); + rend_consider_descriptor_republication(); + } + + /* 8. and blow away any connections that need to die. have to do this now, + * because if we marked a conn for close and left its socket -1, then + * we'll pass it to poll/select and bad things will happen. + */ + close_closeable_connections(); + + /* 8b. And if anything in our state is ready to get flushed to disk, we + * flush it. */ + or_state_save(now); + + /* 8c. Do channel cleanup just like for connections */ + channel_run_cleanup(); + channel_listener_run_cleanup(); + + /* 11b. check pending unconfigured managed proxies */ + if (!net_is_disabled() && pt_proxies_configuration_pending()) + pt_configure_remaining_proxies(); + } static int @@ -1508,16 +1575,6 @@ reset_descriptor_failures_callback(time_t now, const or_options_t *options) } static int -fetch_bridge_descriptors_callback(time_t now, const or_options_t *options) -{ - if (options->UseBridges && !options->DisableNetwork) { - fetch_bridge_descriptors(options, now); - return 1; - } - return -1; -} - -static int rotate_x509_certificate_callback(time_t now, const or_options_t *options) { static int first = 1; @@ -1557,18 +1614,6 @@ add_entropy_callback(time_t now, const or_options_t *options) } static int -enable_accounting_callback(time_t now, const or_options_t *options) -{ - /* 1c. If we have to change the accounting interval or record - * bandwidth used in this accounting interval, do so. */ - if (accounting_is_enabled(options)) { - accounting_run_housekeeping(now); - return 1; - } - return -1; -} - -static int launch_reachability_tests_callback(time_t now, const or_options_t *options) { if (authdir_mode_tests_reachability(options) && @@ -1728,7 +1773,7 @@ rend_cache_failure_clean_callback(time_t now, const or_options_t *options) * clean it as soon as we can since we want to make sure the client waits * as little as possible for reachability reasons. */ rend_cache_failure_clean(now); - return 1; + return 30; } static int @@ -1825,46 +1870,6 @@ fetch_networkstatus_callback(time_t now, const or_options_t *options) } static int -dirvote_act_callback(time_t now, const or_options_t *options) -{ - /* 2c. Let directory voting happen. */ - if (authdir_mode_v3(options)) { - dirvote_act(options, now); - return 1; - } - return -1; -} - -static int -expire_misc_callback(time_t now, const or_options_t *options) -{ - (void)now; - (void)options; - - /* 3a. Every second, we examine pending circuits and prune the - * ones which have been pending for more than a few seconds. - * We do this before step 4, so it can try building more if - * it's not comfortable with the number of available circuits. - */ - /* (If our circuit build timeout can ever become lower than a second (which - * it can't, currently), we should do this more often.) */ - circuit_expire_building(); - - /* 3b. Also look at pending streams and prune the ones that 'began' - * a long time ago but haven't gotten a 'connected' yet. - * Do this before step 4, so we can put them back into pending - * state to be picked up by the new circuit. - */ - connection_ap_expire_beginning(); - - /* 3c. And expire connections that we've held open for too long. - */ - connection_expire_held_open(); - - return 1; -} - -static int retry_listeners_callback(time_t now, const or_options_t *options) { (void)now; @@ -1878,24 +1883,6 @@ retry_listeners_callback(time_t now, const or_options_t *options) } static int -build_circuits_callback(time_t now, const or_options_t *options) -{ - (void)options; - /* 4. Every second, we try a new circuit if there are no valid - * circuits. Every NewCircuitPeriod seconds, we expire circuits - * that became dirty more than MaxCircuitDirtiness seconds ago, - * and we make a new circ if there are no clean circuits. - */ - const int have_dir_info = router_have_minimum_dir_info(); - if (have_dir_info && !net_is_disabled()) { - circuit_build_needed_circs(now); - } else { - circuit_expire_old_circs_as_needed(now); - } - return 1; -} - -static int expire_old_ciruits_serverside_callback(time_t now, const or_options_t *options) { (void)options; @@ -1904,42 +1891,6 @@ expire_old_ciruits_serverside_callback(time_t now, const or_options_t *options) return 11; } -static int -housekeeping_callback(time_t now, const or_options_t *options) -{ - (void)options; - int i; - /* 5. We do housekeeping for each connection... */ - connection_or_set_bad_connections(NULL, 0); - for (i=0;i<smartlist_len(connection_array);i++) { - run_connection_housekeeping(i, now); - } - - /* 6. And remove any marked circuits... */ - circuit_close_all_marked(); - - /* 7. And upload service descriptors if necessary. */ - if (have_completed_a_circuit() && !net_is_disabled()) { - rend_consider_services_upload(now); - rend_consider_descriptor_republication(); - } - - /* 8. and blow away any connections that need to die. have to do this now, - * because if we marked a conn for close and left its socket -1, then - * we'll pass it to poll/select and bad things will happen. - */ - close_closeable_connections(); - - /* 8b. And if anything in our state is ready to get flushed to disk, we - * flush it. */ - or_state_save(now); - - /* 8c. Do channel cleanup just like for connections */ - channel_run_cleanup(); - channel_listener_run_cleanup(); - - return 1; -} static int check_dns_honesty_callback(time_t now, const or_options_t *options) @@ -1999,26 +1950,17 @@ check_fw_helper_app_callback(time_t now, const or_options_t *options) } static int -pt_configuration_callback(time_t now, const or_options_t *options) -{ - (void)now; - (void)options; - /* 11b. check pending unconfigured managed proxies */ - if (!net_is_disabled() && pt_proxies_configuration_pending()) - pt_configure_remaining_proxies(); - return 1; -} - -static int heartbeat_callback(time_t now, const or_options_t *options) { static int first = 1; /* 12. write the heartbeat message */ if (first) { - first = 0; + first = 0; /* Skip the first one. */ } else { log_heartbeat(now); } + /* XXXX This isn't such a good way to handle possible changes in the + * callback event */ return options->HeartbeatPeriod; }

1 0

[tor/master] fix whitespace; remove dead code
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit 65a6489e5e52ff9b80e10e5fdea0cdd3e1097810 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 2 15:11:16 2015 -0500 fix whitespace; remove dead code --- src/or/main.c | 2 -- src/or/periodic.c | 12 ------------ src/or/periodic.h | 21 --------------------- 3 files changed, 35 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index e0ea856..d5d4112 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1505,7 +1505,6 @@ run_scheduled_events(time_t now) /* 11b. check pending unconfigured managed proxies */ if (!net_is_disabled() && pt_proxies_configuration_pending()) pt_configure_remaining_proxies(); - } static int @@ -1891,7 +1890,6 @@ expire_old_ciruits_serverside_callback(time_t now, const or_options_t *options) return 11; } - static int check_dns_honesty_callback(time_t now, const or_options_t *options) { diff --git a/src/or/periodic.c b/src/or/periodic.c index 6fa1d8a..8ae8333 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -104,15 +104,3 @@ periodic_event_destroy(periodic_event_item_t *event) event->last_action_time = 0; } -/** DOCDOC */ -void -periodic_event_assert_in_range(periodic_event_item_t *ev, - time_t start, time_t end) -{ - if (ev->last_action_time < start-1 || ev->last_action_time > end) { - log_err(LD_BUG, "[Refactor Bug] Missed an interval in a range," - "Got %lu, wanted %lu <= x <= %lu.", ev->last_action_time, - start, end); - tor_assert(0); - } -} diff --git a/src/or/periodic.h b/src/or/periodic.h index 3a73f64..2ab3db0 100644 --- a/src/or/periodic.h +++ b/src/or/periodic.h @@ -13,7 +13,6 @@ typedef int (*periodic_event_helper_t)(time_t now, const or_options_t *options); - /** A single item for the periodic-events-function table. */ typedef struct periodic_event_item_t { periodic_event_helper_t fn; /**< The function to run the event */ @@ -27,26 +26,6 @@ typedef struct periodic_event_item_t { #define PERIODIC_EVENT(fn) { fn##_callback, 0, 0, NULL, #fn } #define END_OF_PERIODIC_EVENTS { NULL, 0, 0, NULL, NULL } -#if 0 -/** Refactor test, check the last_action_time was now or (now - delta - 1) -* It returns an incremented now value and accounts for the current -* implementation's off by one error in it's comparisons. */ -#define INCREMENT_DELTA_AND_TEST(id, now, delta) \ - (now+delta); \ - STMT_BEGIN \ - periodic_event_item_t *ev = &periodic_events[id]; \ - if (ev->last_action_time != now - delta - 1 && \ - ev->last_action_time != now) { \ - log_err(LD_BUG, "[Refactor Bug] Missed an interval " \ - "for %s, Got %lu, wanted %lu or %lu.", ev->name, \ - ev->last_action_time, now, now-delta); \ - tor_assert(0); \ - } \ - STMT_END -#endif - -void periodic_event_assert_in_range(periodic_event_item_t *event, - time_t start, time_t end); void periodic_event_launch(periodic_event_item_t *event); void periodic_event_destroy(periodic_event_item_t *event); void periodic_event_reschedule(periodic_event_item_t *event);

1 0

[tor/master] Change periodic.c to use libevent directly
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit dd00fd0a1f3d9c30d94c00ce7f847298b4494c7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 2 15:36:09 2015 -0500 Change periodic.c to use libevent directly Libevent's periodic timers aren't the right solution when the timeout potentially changes every time. --- src/or/periodic.c | 52 +++++++++++++++++++++++++--------------------------- src/or/periodic.h | 9 +++++---- 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/src/or/periodic.c b/src/or/periodic.c index 8ae8333..44e1714 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -2,9 +2,16 @@ /* See LICENSE for licensing information */ #include "or.h" +#include "compat_libevent.h" #include "config.h" #include "periodic.h" +#ifdef HAVE_EVENT2_EVENT_H +#include <event2/event.h> +#else +#include <event.h> +#endif + static const int MAX_INTERVAL = 10 * 365 * 86400; /** DOCDOC */ @@ -12,24 +19,21 @@ static void periodic_event_set_interval(periodic_event_item_t *event, time_t next_interval) { - /** update the interval time if it's changed */ - if (next_interval != event->interval) { - tor_assert(next_interval < MAX_INTERVAL); - struct timeval tv; - tv.tv_sec = next_interval; - tv.tv_usec = 0; - event->interval = (int)next_interval; - periodic_timer_update_interval(event->timer, &tv); - } + tor_assert(next_interval < MAX_INTERVAL); + struct timeval tv; + tv.tv_sec = next_interval; + tv.tv_usec = 0; + event_add(event->ev, &tv); } /** Wraps dispatches for periodic events, data will be a pointer to the * event that needs to be called */ static void -periodic_event_dispatch(periodic_timer_t *timer, void *data) +periodic_event_dispatch(evutil_socket_t fd, short what, void *data) { + (void)fd; + (void)what; periodic_event_item_t *event = data; - tor_assert(timer == event->timer); time_t now = time(NULL); const or_options_t *options = get_options(); @@ -55,7 +59,8 @@ periodic_event_dispatch(periodic_timer_t *timer, void *data) next_interval = 1; } - periodic_event_set_interval(event, next_interval); + struct timeval tv = { next_interval , 0 }; + event_add(event->ev, &tv); log_info(LD_GENERAL, "Dispatching %s", event->name); } @@ -72,24 +77,19 @@ periodic_event_reschedule(periodic_event_item_t *event) void periodic_event_launch(periodic_event_item_t *event) { - if (event->timer) { /** Already setup? This is a bug */ + if (event->ev) { /** Already setup? This is a bug */ log_err(LD_BUG, "Initial dispatch should only be done once."); tor_assert(0); } - struct timeval interval; - interval.tv_sec = event->interval; - interval.tv_usec = 0; - - periodic_timer_t *timer = periodic_timer_new(tor_libevent_get_base(), - &interval, - periodic_event_dispatch, - event); - tor_assert(timer); - event->timer = timer; + event->ev = tor_event_new(tor_libevent_get_base(), + -1, 0, + periodic_event_dispatch, + event); + tor_assert(event->ev); // Initial dispatch - periodic_event_dispatch(timer, event); + periodic_event_dispatch(-1, EV_TIMEOUT, event); } /** DOCDOC */ @@ -98,9 +98,7 @@ periodic_event_destroy(periodic_event_item_t *event) { if (!event) return; - periodic_timer_free(event->timer); - event->timer = 0; - event->interval = 0; + tor_event_free(event->ev); event->last_action_time = 0; } diff --git a/src/or/periodic.h b/src/or/periodic.h index 2ab3db0..e57666c 100644 --- a/src/or/periodic.h +++ b/src/or/periodic.h @@ -13,18 +13,19 @@ typedef int (*periodic_event_helper_t)(time_t now, const or_options_t *options); +struct event; + /** A single item for the periodic-events-function table. */ typedef struct periodic_event_item_t { periodic_event_helper_t fn; /**< The function to run the event */ - int interval; /**< The interval for running the function (In seconds). */ time_t last_action_time; /**< The last time the function did something */ - periodic_timer_t *timer; /**< Timer object for this event */ + struct event *ev; /**< Libevent callback we're using to implement this */ const char *name; /**< Name of the function -- for debug */ } periodic_event_item_t; /** events will get their interval from first execution */ -#define PERIODIC_EVENT(fn) { fn##_callback, 0, 0, NULL, #fn } -#define END_OF_PERIODIC_EVENTS { NULL, 0, 0, NULL, NULL } +#define PERIODIC_EVENT(fn) { fn##_callback, 0, NULL, #fn } +#define END_OF_PERIODIC_EVENTS { NULL, 0, NULL, NULL } void periodic_event_launch(periodic_event_item_t *event); void periodic_event_destroy(periodic_event_item_t *event);

1 0

[tor/master] Changes to 3199 branch based on feedback from special
by nickm＠torproject.org 17 Nov '15

17 Nov '15

commit 661e5bdbfae8f66a5b12caeb8636e665186bcc55 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 17 08:26:04 2015 -0500 Changes to 3199 branch based on feedback from special --- src/or/main.c | 24 ++++++++++++------------ src/or/periodic.c | 10 ++++++---- src/or/periodic.h | 13 +++++++------ 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 1dd791f..9fc6035 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1455,7 +1455,7 @@ run_scheduled_events(time_t now) dirvote_act(options, now); } - /* 3a. Every second, we examine pending circuits and prune the + /* 3a. Every second, we examine pending circuits and prune the * ones which have been pending for more than a few seconds. * We do this before step 4, so it can try building more if * it's not comfortable with the number of available circuits. @@ -1545,7 +1545,7 @@ rotate_onion_key_callback(time_t now, const or_options_t *options) router_upload_dir_desc_to_dirservers(0); return MIN_ONION_KEY_LIFETIME; } - return -1; + return PERIODIC_EVENT_NO_UPDATE; } static int @@ -1562,21 +1562,21 @@ check_ed_keys_callback(time_t now, const or_options_t *options) } return 30; } - return -1; + return PERIODIC_EVENT_NO_UPDATE; } static int launch_descriptor_fetches_callback(time_t now, const or_options_t *options) { if (should_delay_dir_fetches(options, NULL)) - return -1; + return PERIODIC_EVENT_NO_UPDATE; update_all_descriptor_downloads(now); update_extrainfo_downloads(now); if (router_have_minimum_dir_info()) return LAZY_DESCRIPTOR_RETRY_INTERVAL; else - return GREEDY_DESCRIPTOR_RETRY_INTERVAL; + return GREEDY_DESCRIPTOR_RETRY_INTERVAL; } static int @@ -1609,7 +1609,7 @@ rotate_x509_certificate_callback(time_t now, const or_options_t *options) /* We also make sure to rotate the TLS connections themselves if they've * been up for too long -- but that's done via is_bad_for_new_circs in - * connection_run_housekeeping() above. */ + * run_connection_housekeeping() above. */ return MAX_SSL_KEY_LIFETIME_INTERNAL; } @@ -1763,7 +1763,7 @@ record_bridge_stats_callback(time_t now, const or_options_t *options) * next time bridge mode is turned on. */ should_init_bridge_stats = 1; } - return -1; + return PERIODIC_EVENT_NO_UPDATE; } static int @@ -1877,7 +1877,7 @@ fetch_networkstatus_callback(time_t now, const or_options_t *options) #define networkstatus_dl_check_interval(o) ((o)->TestingTorNetwork ? 1 : 60) if (should_delay_dir_fetches(options, NULL)) - return -1; + return PERIODIC_EVENT_NO_UPDATE; update_networkstatus_downloads(now); return networkstatus_dl_check_interval(options); @@ -1893,7 +1893,7 @@ retry_listeners_callback(time_t now, const or_options_t *options) retry_all_listeners(NULL, NULL, 0); return 60; } - return -1; + return PERIODIC_EVENT_NO_UPDATE; } static int @@ -1914,7 +1914,7 @@ check_dns_honesty_callback(time_t now, const or_options_t *options) if (net_is_disabled() || ! public_server_mode(options) || router_my_exit_policy_is_reject_star()) - return -1; + return PERIODIC_EVENT_NO_UPDATE; static int first_time = 1; if (first_time) { @@ -1936,7 +1936,7 @@ write_bridge_ns_callback(time_t now, const or_options_t *options) #define BRIDGE_STATUSFILE_INTERVAL (30*60) return BRIDGE_STATUSFILE_INTERVAL; } - return -1; + return PERIODIC_EVENT_NO_UPDATE; } static int @@ -1945,7 +1945,7 @@ check_fw_helper_app_callback(time_t now, const or_options_t *options) if (net_is_disabled() || ! server_mode(options) || ! options->PortForwarding) { - return -1; + return PERIODIC_EVENT_NO_UPDATE; } /* 11. check the port forwarding app */ diff --git a/src/or/periodic.c b/src/or/periodic.c index 708c009..e21b1af 100644 --- a/src/or/periodic.c +++ b/src/or/periodic.c @@ -12,8 +12,9 @@ #include <event.h> #endif -/** We disable any interval greate than this number of seconds, on the ground - * that it is probably an absolute time mistakenly passed in as a relative time. +/** We disable any interval greater than this number of seconds, on the + * grounds that it is probably an absolute time mistakenly passed in as a + * relative time. */ static const int MAX_INTERVAL = 10 * 365 * 86400; @@ -41,6 +42,7 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data) time_t now = time(NULL); const or_options_t *options = get_options(); + log_debug(LD_GENERAL, "Dispatching %s", event->name); int r = event->fn(now, options); int next_interval = 0; @@ -63,10 +65,10 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data) next_interval = 1; } + log_debug(LD_GENERAL, "Scheduling %s for %d seconds", event->name, + next_interval); struct timeval tv = { next_interval , 0 }; event_add(event->ev, &tv); - - log_info(LD_GENERAL, "Dispatching %s", event->name); } /** Schedules event to run as soon as possible from now. */ diff --git a/src/or/periodic.h b/src/or/periodic.h index e57666c..a77f411 100644 --- a/src/or/periodic.h +++ b/src/or/periodic.h @@ -4,12 +4,13 @@ #ifndef TOR_PERIODIC_H #define TOR_PERIODIC_H -/** Callback function for a periodic event to take action. -* The return value influences the next time the function will get called. -* Return -1 to not update last_action_time and be polled again in -* the next second. If a positive value is returned it will update the -* interval time. If the returned value is larger than now then it -* is assumed to be a future time to poll again. */ +#define PERIODIC_EVENT_NO_UPDATE (-1) + +/** Callback function for a periodic event to take action. The return value +* influences the next time the function will get called. Return +* PERIODIC_EVENT_NO_UPDATE to not update last_action_time and be polled +* again in the next second. If a positive value is returned it will update the +* interval time. */ typedef int (*periodic_event_helper_t)(time_t now, const or_options_t *options);

1 0