nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a test assertion failure due to uninitialized mainloop events

Browse Source 
Bug not in any released Tor.
This commit is contained in:
Nick Mathewson 2018-04-26 14:38:43 -04:00
parent 9fd319168b
commit 302908657f
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/or/main.c
View File

@ -2617,6 +2617,20 @@ do_hup(void)
return 0;
}
/** Initialize some mainloop_event_t objects that we require. */
STATIC void
initialize_mainloop_events(void)
{
if (!schedule_active_linked_connections_event) {
schedule_active_linked_connections_event =
mainloop_event_postloop_new(schedule_active_linked_connections_cb, NULL);
}
if (!postloop_cleanup_ev) {
postloop_cleanup_ev =
mainloop_event_postloop_new(postloop_cleanup_cb, NULL);
}
}
/** Tor main loop. */
int
do_main_loop(void)
@ -2630,14 +2644,7 @@ do_main_loop(void)
initialize_periodic_events();
}
if (!schedule_active_linked_connections_event) {
schedule_active_linked_connections_event =
mainloop_event_postloop_new(schedule_active_linked_connections_cb, NULL);
}
if (!postloop_cleanup_ev) {
postloop_cleanup_ev =
mainloop_event_postloop_new(postloop_cleanup_cb, NULL);
}
initialize_mainloop_events();
/* initialize dns resolve map, spawn workers if needed */
if (dns_init() < 0) {

1
src/or/main.h
View File

@ -97,6 +97,7 @@ extern token_bucket_rw_t global_relayed_bucket;
#ifdef MAIN_PRIVATE
STATIC void init_connection_lists(void);
STATIC void initialize_mainloop_events(void);
STATIC void close_closeable_connections(void);
STATIC void initialize_periodic_events(void);
STATIC void teardown_periodic_events(void);

3
src/test/testing_common.c
View File

@ -8,6 +8,7 @@
* \brief Common pieces to implement unit tests.
**/
#define MAIN_PRIVATE
#include "orconfig.h"
#include "or.h"
#include "control.h"
@ -16,6 +17,7 @@
#include "backtrace.h"
#include "test.h"
#include "channelpadding.h"
#include "main.h"
#include <stdio.h>
#ifdef HAVE_FCNTL_H
@ -290,6 +292,7 @@ main(int c, const char **v)
}
rep_hist_init();
setup_directory();
initialize_mainloop_events();
options_init(options);
options->DataDirectory = tor_strdup(temp_dir);
tor_asprintf(&options->KeyDirectory, "%s"PATH_SEPARATOR"keys",