diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-02-18 07:23:38 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-02-18 07:23:38 +0000 |
| commit | 67c0c64aa4cfa67561d4189443fe3663c8190b18 (patch) | |
| tree | 968d8a6067925e898baafd6c9c1b77269a09bdba /src/or/config.c | |
| parent | 4e178907abc0b9cccbd7a5fc0fd19c98d87f3eee (diff) | |
| download | tor-67c0c64aa4cfa67561d4189443fe3663c8190b18.tar tor-67c0c64aa4cfa67561d4189443fe3663c8190b18.tar.gz | |
go back to a single exitpolicy parameter
if your exitpolicy includes " *:*" then it is final,
else we append the default exit policy.
(thanks weasel)
svn:r1105
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index 877a1dfa8..713a58508 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -165,7 +165,6 @@ static void config_assign(or_options_t *options, struct config_line *list) { config_compare(list, "ExitNodes", CONFIG_TYPE_STRING, &options->ExitNodes) || config_compare(list, "EntryNodes", CONFIG_TYPE_STRING, &options->EntryNodes) || config_compare(list, "ExitPolicy", CONFIG_TYPE_STRING, &options->ExitPolicy) || - config_compare(list, "ExitPolicyPrepend",CONFIG_TYPE_STRING, &options->ExitPolicyPrepend) || config_compare(list, "ExcludedNodes", CONFIG_TYPE_STRING, &options->ExcludedNodes) || config_compare(list, "Group", CONFIG_TYPE_STRING, &options->Group) || @@ -244,7 +243,6 @@ void free_options(or_options_t *options) { tor_free(options->EntryNodes); tor_free(options->ExcludedNodes); tor_free(options->ExitPolicy); - tor_free(options->ExitPolicyPrepend); tor_free(options->SocksBindAddress); tor_free(options->ORBindAddress); tor_free(options->DirBindAddress); @@ -260,8 +258,7 @@ void init_options(or_options_t *options) { options->ExitNodes = tor_strdup(""); options->EntryNodes = tor_strdup(""); options->ExcludedNodes = tor_strdup(""); - options->ExitPolicy = tor_strdup("reject 0.0.0.0/8,reject 169.254.0.0/16,reject 127.0.0.0/8,reject 192.168.0.0/16,reject 10.0.0.0/8,reject 172.16.0.0/12,accept *:20-22,accept *:53,accept *:79-80,accept *:110,accept *:143,accept *:443,accept *:873,accept *:993,accept *:995,accept *:1024-65535,reject *:*"); - options->ExitPolicyPrepend = tor_strdup(""); + options->ExitPolicy = tor_strdup(""); options->SocksBindAddress = tor_strdup("127.0.0.1"); options->ORBindAddress = tor_strdup("0.0.0.0"); options->DirBindAddress = tor_strdup("0.0.0.0"); |