diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-01-03 06:33:03 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-01-03 06:33:03 +0000 |
| commit | d677332a83dfb04e998b50daffa822c59b380a4f (patch) | |
| tree | aa6d4e1c06e6632b13427005e0522f3fc9420da7 /src/or/config.c | |
| parent | eebbfbc8545975d6fea76ad4ffe2ae551560cbf8 (diff) | |
| download | tor-d677332a83dfb04e998b50daffa822c59b380a4f.tar.gz tor-d677332a83dfb04e998b50daffa822c59b380a4f.zip | |
checkpoint as we add PreferTunneledDirConns config option
svn:r9249
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index c512dc038a..d5f7e77a93 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -208,6 +208,7 @@ static config_var_t _option_vars[] = { VAR("OutboundBindAddress", STRING, OutboundBindAddress, NULL), VAR("PathlenCoinWeight", DOUBLE, PathlenCoinWeight, "0.3"), VAR("PidFile", STRING, PidFile, NULL), + VAR("PreferTunneledDirConns", BOOL, PreferTunneledDirConns, "1"), VAR("ProtocolWarnings", BOOL, ProtocolWarnings, "0"), VAR("PublishServerDescriptor",BOOL, PublishServerDescriptor,"1"), VAR("PublishHidServDescriptors",BOOL,PublishHidServDescriptors, "1"), @@ -346,6 +347,7 @@ static config_var_description_t options_description[] = { "provided IP address (only usefol for multiple network interfaces)." }, { "PIDFile", "On startup, write our PID to this file. On clean shutdown, " "remove the file." }, + /* PreferTunneledDirConns */ /* ProtocolWarnings */ /* RephistTrackTime */ { "RunAsDaemon", "If set, Tor forks and daemonizes to the background when " @@ -2707,6 +2709,9 @@ options_validate(or_options_t *old_options, or_options_t *options, if (parse_virtual_addr_network(options->VirtualAddrNetwork, 1, NULL)<0) return -1; + if (options->PreferTunneledDirConns && !options->TunnelDirConns) + REJECT("Must set TunnelDirConns if PreferTunneledDirConns is set."); + return 0; #undef REJECT #undef COMPLAIN |