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

Merge remote-tracking branch 'origin/maint-0.2.6'

Browse Source
This commit is contained in:
Nick Mathewson 2015-03-12 13:13:06 -04:00
commit 16b1b2199d
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug15240 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (pluggable transports):
- Initialize the extended OR Port authentication cookie before launching
pluggable transports. This prevents a race condition that occured when
server-side pluggable transports would cache the authentication cookie
before it has been (re)generated. Fixes bug 15240; bugfix on
0.2.5.1-alpha.

13
src/or/config.c
View File

@ -1451,6 +1451,13 @@ options_act(const or_options_t *old_options)
rep_hist_load_mtbf_data(time(NULL)); rep_hist_load_mtbf_data(time(NULL));
} }
/* If we have an ExtORPort, initialize its auth cookie. */
if (running_tor &&
init_ext_or_cookie_authentication(!!options->ExtORPort_lines) < 0) {
log_warn(LD_CONFIG,"Error creating Extended ORPort cookie file.");
return -1;
}
mark_transport_list(); mark_transport_list();
pt_prepare_proxy_list_for_config_read(); pt_prepare_proxy_list_for_config_read();
if (!options->DisableNetwork) { if (!options->DisableNetwork) {
@ -1555,12 +1562,6 @@ options_act(const or_options_t *old_options)
return -1; return -1;
} }
/* If we have an ExtORPort, initialize its auth cookie. */
if (init_ext_or_cookie_authentication(!!options->ExtORPort_lines) < 0) {
log_warn(LD_CONFIG,"Error creating Extended ORPort cookie file.");
return -1;
}
monitor_owning_controller_process(options->OwningControllerProcess); monitor_owning_controller_process(options->OwningControllerProcess);
/* reload keys as needed for rendezvous services. */ /* reload keys as needed for rendezvous services. */