diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-23 12:35:23 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-23 12:35:23 -0400 |
| commit | 692005b38d3607f53d9fb605a6b4584553417ad9 (patch) | |
| tree | 8e2eb5f8438bf8431d17c8d4fdf00235a8ffa340 | |
| parent | 6cf8e38eca78bfb5d4fd38733deb5b358ac4fdea (diff) | |
| parent | a1d060a68f62af3c9813f530eab70ce70d70fd6c (diff) | |
| download | tor-692005b38d3607f53d9fb605a6b4584553417ad9.tar.gz tor-692005b38d3607f53d9fb605a6b4584553417ad9.zip | |
Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3
| -rw-r--r-- | changes/bug6274 | 3 | ||||
| -rw-r--r-- | changes/bug6274_2 | 3 | ||||
| -rw-r--r-- | src/or/config.c | 9 |
3 files changed, 14 insertions, 1 deletions
diff --git a/changes/bug6274 b/changes/bug6274 new file mode 100644 index 0000000000..ad1abcde54 --- /dev/null +++ b/changes/bug6274 @@ -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. diff --git a/changes/bug6274_2 b/changes/bug6274_2 new file mode 100644 index 0000000000..89576f9328 --- /dev/null +++ b/changes/bug6274_2 @@ -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. diff --git a/src/or/config.c b/src/or/config.c index 8703667945..918efd4cf8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1464,7 +1464,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) { if (parse_server_transport_line(cl->value, 0)<0) { log_warn(LD_BUG, @@ -4019,6 +4019,13 @@ options_validate(or_options_t *old_options, or_options_t *options, 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 the user wants to constrain socket buffer use, make sure the desired * limit is between MIN|MAX_TCPSOCK_BUFFER in k increments. */ |