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

Mark libevent unitialized on shutdown.

Browse Source 
This is necessary so that we will reinitialize it on startup.
This commit is contained in:
Nick Mathewson 2017-12-11 11:37:20 -05:00
parent 322abc030e
commit 474ca13d6a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/config.c
View File

@ -796,6 +796,8 @@ static smartlist_t *configured_ports = NULL;
/** True iff we're currently validating options, and any calls to /** True iff we're currently validating options, and any calls to
* get_options() are likely to be bugs. */ * get_options() are likely to be bugs. */
static int in_option_validation = 0; static int in_option_validation = 0;
/* True iff we've initialized libevent */
static int libevent_initialized = 0;
/** Return the contents of our frontpage string, or NULL if not configured. */ /** Return the contents of our frontpage string, or NULL if not configured. */
MOCK_IMPL(const char*, MOCK_IMPL(const char*,
@ -986,6 +988,7 @@ config_free_all(void)
tor_free(the_tor_version); tor_free(the_tor_version);
have_parsed_cmdline = 0; have_parsed_cmdline = 0;
libevent_initialized = 0;
} }
/** Make <b>address</b> -- a piece of information related to our operation as /** Make <b>address</b> -- a piece of information related to our operation as
@ -1336,7 +1339,6 @@ options_act_reversible(const or_options_t *old_options, char **msg)
{ {
smartlist_t *new_listeners = smartlist_new(); smartlist_t *new_listeners = smartlist_new();
smartlist_t *replaced_listeners = smartlist_new(); smartlist_t *replaced_listeners = smartlist_new();
static int libevent_initialized = 0;
or_options_t *options = get_options_mutable(); or_options_t *options = get_options_mutable();
int running_tor = options->command == CMD_RUN_TOR; int running_tor = options->command == CMD_RUN_TOR;
int set_conn_limit = 0; int set_conn_limit = 0;