diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-05-24 20:31:30 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-05-24 20:31:30 +0000 |
| commit | 703bf1962068a2beb8754f9bb772efd7eb3c100d (patch) | |
| tree | 4fa9db1792fad7b4bcc36f2ff466f9033549eaca /src/or/config.c | |
| parent | 17830bc03ba26dc90258f436fbd9786cf769027c (diff) | |
| download | tor-703bf1962068a2beb8754f9bb772efd7eb3c100d.tar tor-703bf1962068a2beb8754f9bb772efd7eb3c100d.tar.gz | |
r12942@catbus: nickm | 2007-05-24 16:31:22 -0400
Well, that was easier than I thought it would be. Tor is now a DNS proxy as well as a socks proxy. Probably some bugs remain, but since it A) has managed to resolve one address for me successfully, and B) will not affect anybody who leaves DNSPort unset, it feel like a good time to commit.
svn:r10317
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 05e32d71c..8cfd5087f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -155,6 +155,8 @@ static config_var_t _option_vars[] = { VAR("DirPort", UINT, DirPort, "0"), OBSOLETE("DirPostPeriod"), VAR("DirServer", LINELIST, DirServers, NULL), + VAR("DNSPort", UINT, DNSPort, "0"), + VAR("DNSListenAddress", LINELIST, DNSListenAddress, NULL), VAR("DownloadExtraInfo", BOOL, DownloadExtraInfo, "0"), VAR("EnforceDistinctSubnets", BOOL, EnforceDistinctSubnets,"1"), VAR("EntryNodes", STRING, EntryNodes, NULL), @@ -2415,6 +2417,9 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->DirPort == 0 && options->DirListenAddress != NULL) REJECT("DirPort must be defined if DirListenAddress is defined."); + if (options->DNSPort == 0 && options->DNSListenAddress != NULL) + REJECT("DirPort must be defined if DirListenAddress is defined."); + if (options->ControlPort == 0 && options->ControlListenAddress != NULL) REJECT("ControlPort must be defined if ControlListenAddress is defined."); @@ -2523,6 +2528,9 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->SocksPort < 0 || options->SocksPort > 65535) REJECT("SocksPort option out of bounds."); + if (options->DNSPort < 0 || options->DNSPort > 65535) + REJECT("DNSPort option out of bounds."); + if (options->TransPort < 0 || options->TransPort > 65535) REJECT("TransPort option out of bounds."); |