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

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

Browse source
This commit is contained in:
Nick Mathewson 2012-07-23 12:36:04 -04:00
commit 20b625a0fd
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug6274 Normal file
View file

@ -0,0 +1,3 @@
o Minor bugfixes:
- Ignore ServerTransportPlugin lines when Tor is not configured as
a relay. Fixes bug 6274; bugfix on 0.2.3.6-alpha.

3
changes/bug6274_2 Normal file
View file

@ -0,0 +1,3 @@
o Minor features:
- Terminate active server managed proxies if Tor stops being a
relay. Addresses parts of bug 6274; bugfix on 0.2.3.6-alpha.

9
src/or/config.c
View file

@ -1466,7 +1466,7 @@ options_act(const or_options_t *old_options)
} }
} }
if (options->ServerTransportPlugin) { 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(cl->value, 0)<0) { if (parse_server_transport_line(cl->value, 0)<0) {
log_warn(LD_BUG, log_warn(LD_BUG,
@ -4021,6 +4021,13 @@ options_validate(or_options_t *old_options, or_options_t *options,
REJECT("Server transport line did not parse. See logs for details."); REJECT("Server transport line did not parse. See logs for details.");
} }
if (options->ServerTransportPlugin && !server_mode(options)) {
log_notice(LD_GENERAL, "Tor is not configured as a relay but you specified"
" a ServerTransportPlugin line (%s). The ServerTransportPlugin "
"line will be ignored.",
esc_for_log(options->ServerTransportPlugin->value));
}
if (options->ConstrainedSockets) { if (options->ConstrainedSockets) {
/* If the user wants to constrain socket buffer use, make sure the desired /* If the user wants to constrain socket buffer use, make sure the desired
* limit is between MIN|MAX_TCPSOCK_BUFFER in k increments. */ * limit is between MIN|MAX_TCPSOCK_BUFFER in k increments. */