diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-03 10:47:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-03 10:47:35 -0400 |
| commit | 13ec1bf5c2d5195789eaa0a002d021c9693a3b71 (patch) | |
| tree | 93361a0599f43002230ad21974af256b1dc0d4f5 /src/or/config.c | |
| parent | 587cc311407e10c04962a9dd69513cc5a71aedd5 (diff) | |
| parent | b79d50dfcc77013329b2fbfd4a84af29a5965b27 (diff) | |
| download | tor-13ec1bf5c2d5195789eaa0a002d021c9693a3b71.tar.gz tor-13ec1bf5c2d5195789eaa0a002d021c9693a3b71.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index 988998ed56..124dcb97d9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -387,7 +387,7 @@ static config_var_t _option_vars[] = { V(TransPort, PORT, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), - V(UseBridges, BOOL, "0"), + VAR("UseBridges", STRING, UseBridges_, "auto"), V(UseEntryGuards, BOOL, "1"), V(UseMicrodescriptors, AUTOBOOL, "0"), V(User, STRING, NULL), @@ -3308,6 +3308,19 @@ options_validate(or_options_t *old_options, or_options_t *options, "of the Internet, so they must not set Reachable*Addresses " "or FascistFirewall."); + /* XXX023 use autobool instead. */ + if (!strcmp(options->UseBridges_, "auto")) { + options->UseBridges = (options->Bridges && + !server_mode(options) && + !options->EntryNodes); + } else if (!strcmp(options->UseBridges_, "0")) { + options->UseBridges = 0; + } else if (!strcmp(options->UseBridges_, "1")) { + options->UseBridges = 1; + } else { + REJECT("UseBridges must be 0, 1, or auto"); + } + if (options->UseBridges && server_mode(options)) REJECT("Servers must be able to freely connect to the rest " @@ -3653,10 +3666,8 @@ options_validate(or_options_t *old_options, or_options_t *options, if (validate_dir_authorities(options, old_options) < 0) REJECT("Directory authority line did not parse. See logs for details."); - if (options->UseBridges && !options->Bridges) - REJECT("If you set UseBridges, you must specify at least one bridge."); if (options->UseBridges && !options->TunnelDirConns) - REJECT("If you set UseBridges, you must set TunnelDirConns."); + REJECT("TunnelDirConns set to 0 only works with UseBridges set to 0"); if (options->Bridges) { for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 1)<0) |