summaryrefslogtreecommitdiff
path: root/src/or/main.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-04-23 11:02:05 -0400
committerNick Mathewson <nickm@torproject.org>2018-04-23 11:02:05 -0400
commit192c7c8bf9a3c53d32e83557ebc62cf7cfa3b1ca (patch)
treed702b143ee6e486f413494ae53786d8625234769 /src/or/main.h
parent3527f4b8a4f002e7b910eacd4ead6e9044cb4003 (diff)
parent665e23c59a370157c5e3526e29590798b1933ed5 (diff)
downloadtor-192c7c8bf9a3c53d32e83557ebc62cf7cfa3b1ca.tar.gz
tor-192c7c8bf9a3c53d32e83557ebc62cf7cfa3b1ca.zip
Merge remote-tracking branch 'dgoulet/ticket25762_034_05'
Diffstat (limited to 'src/or/main.h')
-rw-r--r--src/or/main.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/or/main.h b/src/or/main.h
index 0d2681bda8..0e3de7d4be 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -87,6 +87,8 @@ uint64_t get_main_loop_success_count(void);
uint64_t get_main_loop_error_count(void);
uint64_t get_main_loop_idle_count(void);
+void periodic_events_on_new_options(const or_options_t *options);
+
extern time_t time_of_process_start;
extern int quiet_level;
extern token_bucket_rw_t global_bucket;
@@ -97,8 +99,13 @@ STATIC void init_connection_lists(void);
STATIC void close_closeable_connections(void);
STATIC void initialize_periodic_events(void);
STATIC void teardown_periodic_events(void);
+STATIC int get_my_roles(const or_options_t *options);
#ifdef TOR_UNIT_TESTS
extern smartlist_t *connection_array;
+
+/* We need the periodic_event_item_t definition. */
+#include "periodic.h"
+extern periodic_event_item_t periodic_events[];
#endif
#endif /* defined(MAIN_PRIVATE) */