aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-02-19 22:02:02 +0000
committerRoger Dingledine <arma@torproject.org>2006-02-19 22:02:02 +0000
commit6a52867846bcd0b2f9606037eeed2a5e0cd472b9 (patch)
treee518442d897131bc835b1e61fcfc5cb30c0be152 /src/or/config.c
parentc4f389420ca7b9afe502af50a7dcfc342f5a4f29 (diff)
downloadtor-6a52867846bcd0b2f9606037eeed2a5e0cd472b9.tar
tor-6a52867846bcd0b2f9606037eeed2a5e0cd472b9.tar.gz
New config options to address bug 251:
FetchServerDescriptors and FetchHidServDescriptors for whether to fetch server info and hidserv info or let the controller do it, and also PublishServerDescriptor and PublishHidServDescriptors. Add AllDirActionsPrivate undocumented option -- if you set it, you'll need the controller to bootstrap you enough to build your first circuits. svn:r6047
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index e9449c0d4..c5ff212a8 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -125,6 +125,7 @@ static config_var_t _option_vars[] = {
VAR("AccountingMaxKB", UINT, _AccountingMaxKB, "0"),
VAR("AccountingStart", STRING, AccountingStart, NULL),
VAR("Address", STRING, Address, NULL),
+ VAR("__AllDirActionsPrivate",BOOL, AllDirActionsPrivate, "0"),
VAR("AllowUnverifiedNodes",CSV, AllowUnverifiedNodes,
"middle,rendezvous"),
VAR("AssumeReachable", BOOL, AssumeReachable, "0"),
@@ -158,6 +159,8 @@ static config_var_t _option_vars[] = {
VAR("FascistFirewall", BOOL, FascistFirewall, "0"),
VAR("FirewallPorts", CSV, FirewallPorts, ""),
VAR("FastFirstHopPK", BOOL, FastFirstHopPK, "1"),
+ VAR("FetchServerDescriptors",BOOL, FetchServerDescriptors,"1"),
+ VAR("FetchHidServDescriptors",BOOL, FetchHidServDescriptors, "1"),
VAR("Group", STRING, Group, NULL),
VAR("HardwareAccel", BOOL, HardwareAccel, "0"),
VAR("HashedControlPassword",STRING, HashedControlPassword, NULL),
@@ -197,6 +200,8 @@ static config_var_t _option_vars[] = {
VAR("PathlenCoinWeight", DOUBLE, PathlenCoinWeight, "0.3"),
VAR("PidFile", STRING, PidFile, NULL),
VAR("ProtocolWarnings", BOOL, ProtocolWarnings, "0"),
+ VAR("PublishServerDescriptor",BOOL, PublishServerDescriptor,"1"),
+ VAR("PublishHidServDescriptors",BOOL,PublishHidServDescriptors, "1"),
VAR("ReachableAddresses", LINELIST, ReachableAddresses, NULL),
VAR("ReachableDirAddresses",LINELIST,ReachableDirAddresses,NULL),
VAR("ReachableORAddresses",LINELIST, ReachableORAddresses, NULL),