nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asn/bug9651'

Browse Source
This commit is contained in:
Nick Mathewson 2013-10-14 11:43:33 -04:00
commit 7f2415683a
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/or/config.c
View File

@ -3258,6 +3258,17 @@ options_validate(or_options_t *old_options, or_options_t *options,
smartlist_free(options_sl); 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 (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. */