commit 8c8e21e296548e232fc6d39022f48b6bb0e4709d Author: George Kadianakis desnacked@riseup.net Date: Sat Mar 8 12:22:47 2014 +0000
Improve the log message for when the Extended ORPort is not enabled. --- changes/bug11043 | 5 +++++ src/or/config.c | 25 ++++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/changes/bug11043 b/changes/bug11043 new file mode 100644 index 0000000..cdf534d --- /dev/null +++ b/changes/bug11043 @@ -0,0 +1,5 @@ + o Minor features (log messages): + - Improve the message that gets displayed when Tor as a bridge is + using pluggable transports but doesn't have an Extended ORPort + listener. Furthermore, we now log the message in the log file + too. Resolves ticket 11043. diff --git a/src/or/config.c b/src/or/config.c index 5633696..39ba140 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1341,6 +1341,20 @@ options_act(const or_options_t *old_options) } #endif
+ /* If we are a bridge with a pluggable transport proxy but no + Extended ORPort, inform the user that she is missing out. */ + if (server_mode(options) && options->ServerTransportPlugin && + !options->ExtORPort_lines) { + log_notice(LD_CONFIG, "We use pluggable transports but the Extended " + "ORPort is disabled. Tor and your pluggable transports proxy " + "communicate with each other via the Extended ORPort so it " + "is suggested you enable it: it will also allow your Bridge " + "to collect statistics about its clients that use pluggable " + "transports. Please enable it using the ExtORPort torrc option " + "(e.g. set 'ExtORPort auto')."); + + } + if (options->SafeLogging_ != SAFELOG_SCRUB_ALL && (!old_options || old_options->SafeLogging_ != options->SafeLogging_)) { log_warn(LD_GENERAL, "Your log may contain sensitive information - you " @@ -3258,17 +3272,6 @@ options_validate(or_options_t *old_options, or_options_t *options, smartlist_free(options_sl); }
- /* If we are a bridge with a pluggable transport proxy but no - Extended ORPort, inform the user that she is missing out. */ - if (server_mode(options) && options->ServerTransportPlugin && - !options->ExtORPort_lines) { - log_notice(LD_CONFIG, "We are a bridge with a pluggable transport " - "proxy but the Extended ORPort is disabled. The " - "Extended ORPort helps Tor communicate with the pluggable " - "transport proxy. Please enable it using the ExtORPort " - "torrc option."); - } - 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. */