diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-01-31 12:59:35 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-01-31 12:59:35 -0500 |
| commit | 09ccc4c4a3b67695295ad95f24b2f102d5f2fa1a (patch) | |
| tree | 22954a4eeb94bf31805c6fcd9b6620f37928e3e6 /src/or/config.c | |
| parent | 4fe253ef40a96dbfb978752e9d2833e8b491ca28 (diff) | |
| download | tor-09ccc4c4a3b67695295ad95f24b2f102d5f2fa1a.tar tor-09ccc4c4a3b67695295ad95f24b2f102d5f2fa1a.tar.gz | |
Add support for TPROXY via new TransTPRoxy option
Based on patch from "thomo" at #10582.
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index d348f1036..a2366c06f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -408,6 +408,7 @@ static config_var_t option_vars_[] = { OBSOLETE("TrafficShaping"), V(TransListenAddress, LINELIST, NULL), VPORT(TransPort, LINELIST, NULL), + V(TransTPROXY, BOOL, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), V(UseBridges, BOOL, "0"), @@ -2530,10 +2531,27 @@ options_validate(or_options_t *old_options, or_options_t *options, "undefined, and there aren't any hidden services configured. " "Tor will still run, but probably won't do anything."); -#ifndef USE_TRANSPARENT - /* XXXX024 I think we can remove this TransListenAddress */ - if (options->TransPort_set || options->TransListenAddress) - REJECT("TransPort and TransListenAddress are disabled in this build."); +#ifdef USE_TRANSPARENT + if (options->TransTPROXY) { +#ifndef __linux__ + REJECT("TransTPROXY is a Linux-specific feature.") +#endif + if (!options->TransPort_set) { + REJECT("Cannot use TransTPROXY without any valid TransPort or " + "TransListenAddress."); + } + /* Friendly suggestion about running as root initially. */ + if (!options->User) { + log_warn(LD_CONFIG, + "You have enabled TransTPROXY but have not specified the " + "\"User\" option. TransTPROXY will not function without " + "root privileges."); + } + } +#else + if (options->TransPort_set || options->TransTPROXY) + REJECT("TransPort, TransListenAddress, and TransTPROXY are disabled " + "in this build."); #endif if (options->TokenBucketRefillInterval <= 0 |