mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'yawning/bug13213'

Browse source
This commit is contained in:
Nick Mathewson 2014-09-29 08:57:19 -04:00
commit dc019b0654
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug13213 Normal file
View file

@ -0,0 +1,4 @@
o Minor bugfixes (Bridges):
- When DisableNetwork is set, do not launch pluggable transport
plugins, and if any are running already, terminate the existing
instances. Resolves ticket 13213.

32
src/or/config.c
View file

@ -1399,24 +1399,26 @@ options_act(const or_options_t *old_options)
mark_transport_list(); mark_transport_list();
pt_prepare_proxy_list_for_config_read(); pt_prepare_proxy_list_for_config_read();
if (options->ClientTransportPlugin) { if (!options->DisableNetwork) {
for (cl = options->ClientTransportPlugin; cl; cl = cl->next) { if (options->ClientTransportPlugin) {
if (parse_client_transport_line(options, cl->value, 0)<0) { for (cl = options->ClientTransportPlugin; cl; cl = cl->next) {
log_warn(LD_BUG, if (parse_client_transport_line(options, cl->value, 0)<0) {
"Previously validated ClientTransportPlugin line " log_warn(LD_BUG,
"could not be added!"); "Previously validated ClientTransportPlugin line "
return -1; "could not be added!");
return -1;
}
} }
} }
}
if (options->ServerTransportPlugin && server_mode(options)) { if (options->ServerTransportPlugin && server_mode(options)) {
for (cl = options->ServerTransportPlugin; cl; cl = cl->next) { for (cl = options->ServerTransportPlugin; cl; cl = cl->next) {
if (parse_server_transport_line(options, cl->value, 0)<0) { if (parse_server_transport_line(options, cl->value, 0)<0) {
log_warn(LD_BUG, log_warn(LD_BUG,
"Previously validated ServerTransportPlugin line " "Previously validated ServerTransportPlugin line "
"could not be added!"); "could not be added!");
return -1; return -1;
}
} }
} }
} }