nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 04:56:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug11043_take2_squashed'

Browse Source
This commit is contained in:
Nick Mathewson 2014-03-10 14:08:29 -04:00
commit 0c04416c11
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug11043 Normal file
View File

@ -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.

25
src/or/config.c
View File

@ -1343,6 +1343,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 "
@ -3272,17 +3286,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. */