aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-10-25 06:16:26 +0000
committerRoger Dingledine <arma@torproject.org>2004-10-25 06:16:26 +0000
commit0113a643a2e32b80931400e07d3b7389875570d1 (patch)
treee60392062eb6222025ca15fc02aed0186895711b /src/or/config.c
parentf084bc07b5157fce4d4b647310f152bcaac46c69 (diff)
downloadtor-0113a643a2e32b80931400e07d3b7389875570d1.tar
tor-0113a643a2e32b80931400e07d3b7389875570d1.tar.gz
quick-and-dirty dir policy since the dirservers are getting hammered
nick, could you abstract this sometime so we don't repeat the sockspolicy code twice? svn:r2589
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index fce0e49e3..aafe4c2d0 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -236,6 +236,7 @@ config_assign(or_options_t *options, struct config_line_t *list)
config_compare(list, "DirPort", CONFIG_TYPE_UINT, &options->DirPort) ||
config_compare(list, "DirBindAddress", CONFIG_TYPE_LINELIST, &options->DirBindAddress) ||
config_compare(list, "DirFetchPostPeriod",CONFIG_TYPE_UINT, &options->DirFetchPostPeriod) ||
+ config_compare(list, "DirPolicy", CONFIG_TYPE_LINELIST, &options->DirPolicy) ||
config_compare(list, "DirServer", CONFIG_TYPE_LINELIST, &options->DirServers) ||
config_compare(list, "ExitNodes", CONFIG_TYPE_STRING, &options->ExitNodes) ||
@@ -479,6 +480,7 @@ free_options(or_options_t *options)
config_free_lines(options->DirBindAddress);
config_free_lines(options->ExitPolicy);
config_free_lines(options->SocksPolicy);
+ config_free_lines(options->DirPolicy);
config_free_lines(options->DirServers);
config_free_lines(options->RecommendedVersions);
config_free_lines(options->NodeFamilies);
@@ -487,7 +489,7 @@ free_options(or_options_t *options)
SMARTLIST_FOREACH(options->RedirectExitList,
exit_redirect_t *, p, tor_free(p));
smartlist_free(options->RedirectExitList);
- options->RedirectExitList = NULL;
+ options->RedirectExitList = NULL;
}
if (options->FirewallPorts) {
SMARTLIST_FOREACH(options->FirewallPorts, char *, cp, tor_free(cp));