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

Merge branch 'bug27849_redux'

Browse Source
This commit is contained in:
Nick Mathewson 2018-10-16 17:33:58 -04:00
commit 56a3cef4d7
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket27849 Normal file
View File

@ -0,0 +1,5 @@
o Major bugfixes (mainloop, bootstrap):
- Make sure Tor bootstraps and works properly if only the ControlPort is
set. Prior to this fix, Tor would only bootstrap with at least a client
port being set (Socks, Trans, NATD, DNS or HTTPTunnel port). Fixes bug
27849; bugfix on 0.3.4.1-alpha.

7
src/core/mainloop/mainloop.c
View File

@ -1492,13 +1492,18 @@ get_my_roles(const or_options_t *options)
int roles = 0; int roles = 0;
int is_bridge = options->BridgeRelay; int is_bridge = options->BridgeRelay;
int is_client = options_any_client_port_set(options);
int is_relay = server_mode(options); int is_relay = server_mode(options);
int is_dirauth = authdir_mode_v3(options); int is_dirauth = authdir_mode_v3(options);
int is_bridgeauth = authdir_mode_bridge(options); int is_bridgeauth = authdir_mode_bridge(options);
int is_hidden_service = !!hs_service_get_num_services() || int is_hidden_service = !!hs_service_get_num_services() ||
!!rend_num_services(); !!rend_num_services();
int is_dirserver = dir_server_mode(options); int is_dirserver = dir_server_mode(options);
/* We also consider tor to have the role of a client if the ControlPort is
* set because a lot of things can be done over the control port which
* requires tor to have basic functionnalities. */
int is_client = options_any_client_port_set(options) ||
options->ControlPort_set ||
options->OwningControllerFD >= 0;
if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE; if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE;
if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT; if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT;