Initialize mainloop events earlier, since other stuff may run them.

Fixes a stem test failure; bugfix on c7ce6b9821be22e734b79e0. Bug
not in any released Tor.

diff --git a/src/app/main/main.c b/src/app/main/main.c
index eeb219f3dc32325ee80215e7b04d71f586cb1412..d71e1c7bf2fdbedf9743e418ff421fe27ba573f4 100644 (file)
--- a/src/app/main/main.c
+++ b/src/app/main/main.c
@@ -1269,6 +1269,7 @@ run_tor_main_loop(void)
   handle_signals();
   monotime_init();
   timers_initialize();
+  initialize_mainloop_events();
 
   /* load the private keys, if we're supposed to have them, and set up the
    * TLS context. */

diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index 306c78735bc3df5529a1105fe80bf862e9a76dc2..4e130909483bdc2baece0b4c48f20d83363eaddb 100644 (file)
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -2675,7 +2675,7 @@ dns_servers_relaunch_checks(void)
 }
 
 /** Initialize some mainloop_event_t objects that we require. */
-STATIC void
+void
 initialize_mainloop_events(void)
 {
   if (!schedule_active_linked_connections_event) {

diff --git a/src/core/mainloop/mainloop.h b/src/core/mainloop/mainloop.h
index e3a5acd0d006735c9e273acb54839ceb479a5aea..632733d9a6ff21c63819ad94d0f16cd558e6ddf6 100644 (file)
--- a/src/core/mainloop/mainloop.h
+++ b/src/core/mainloop/mainloop.h
@@ -87,6 +87,7 @@ void do_signewnym(time_t);
 time_t get_last_signewnym_time(void);
 
 void tor_init_connection_lists(void);
+void initialize_mainloop_events(void);
 void tor_mainloop_free_all(void);
 
 struct token_bucket_rw_t;
@@ -97,7 +98,6 @@ extern struct token_bucket_rw_t global_bucket;
 extern struct token_bucket_rw_t global_relayed_bucket;
 
 #ifdef MAINLOOP_PRIVATE
-STATIC void initialize_mainloop_events(void);
 STATIC void close_closeable_connections(void);
 STATIC void initialize_periodic_events(void);
 STATIC void teardown_periodic_events(void);