mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Merge branch 'always_init_base'
This commit is contained in:
commit
abc9ce324e
@ -319,11 +319,7 @@ test_circuit_timeout(void *arg)
|
|||||||
int i, runs;
|
int i, runs;
|
||||||
double close_ms;
|
double close_ms;
|
||||||
(void)arg;
|
(void)arg;
|
||||||
tor_libevent_cfg cfg;
|
|
||||||
|
|
||||||
memset(&cfg, 0, sizeof(cfg));
|
|
||||||
|
|
||||||
tor_libevent_initialize(&cfg);
|
|
||||||
initialize_periodic_events();
|
initialize_periodic_events();
|
||||||
|
|
||||||
circuit_build_times_init(&initial);
|
circuit_build_times_init(&initial);
|
||||||
|
@ -36,11 +36,7 @@ test_cmux_destroy_cell_queue(void *arg)
|
|||||||
circuit_t *circ = NULL;
|
circuit_t *circ = NULL;
|
||||||
cell_queue_t *cq = NULL;
|
cell_queue_t *cq = NULL;
|
||||||
packed_cell_t *pc = NULL;
|
packed_cell_t *pc = NULL;
|
||||||
tor_libevent_cfg cfg;
|
|
||||||
|
|
||||||
memset(&cfg, 0, sizeof(cfg));
|
|
||||||
|
|
||||||
tor_libevent_initialize(&cfg);
|
|
||||||
scheduler_init();
|
scheduler_init();
|
||||||
|
|
||||||
(void) arg;
|
(void) arg;
|
||||||
|
@ -490,7 +490,7 @@ NS(test_main)(void *arg)
|
|||||||
|
|
||||||
(void)arg;
|
(void)arg;
|
||||||
|
|
||||||
TO_CONN(exitconn)->address = tor_strdup("127.0.0.1.in-addr.arpa");
|
TO_CONN(exitconn)->address = tor_strdup("1.0.0.127.in-addr.arpa");
|
||||||
|
|
||||||
NS_MOCK(router_my_exit_policy_is_reject_star);
|
NS_MOCK(router_my_exit_policy_is_reject_star);
|
||||||
|
|
||||||
|
@ -238,6 +238,11 @@ main(int c, const char **v)
|
|||||||
update_approx_time(time(NULL));
|
update_approx_time(time(NULL));
|
||||||
options = options_new();
|
options = options_new();
|
||||||
tor_threads_init();
|
tor_threads_init();
|
||||||
|
|
||||||
|
struct tor_libevent_cfg cfg;
|
||||||
|
memset(&cfg, 0, sizeof(cfg));
|
||||||
|
tor_libevent_initialize(&cfg);
|
||||||
|
|
||||||
control_initialize_event_queue();
|
control_initialize_event_queue();
|
||||||
init_logging(1);
|
init_logging(1);
|
||||||
configure_backtrace_handler(get_version());
|
configure_backtrace_handler(get_version());
|
||||||
|
Loading…
Reference in New Issue
Block a user