summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-03-21 23:27:43 +0000
committerRoger Dingledine <arma@torproject.org>2006-03-21 23:27:43 +0000
commit28fafb9022930e29658093c0670f670037ae28b6 (patch)
tree7c4d62b918001de817e82f0bbf3bf2115b03e7fa /src/or/config.c
parent5399e394a83907fb2e4f06ea6c37cbb9a8f9cb45 (diff)
downloadtor-28fafb9022930e29658093c0670f670037ae28b6.tar.gz
tor-28fafb9022930e29658093c0670f670037ae28b6.zip
new config option SocksTimeout: How long do we let a socks connection
wait unattached before we fail it? Use this value for controller socks timeout, for normal socks timeout, and for hidden-service socks timeout. svn:r6217
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index b7aacec2d8..1dadbb606b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -223,6 +223,7 @@ static config_var_t _option_vars[] = {
VAR("SocksListenAddress", LINELIST, SocksListenAddress, NULL),
VAR("SocksPolicy", LINELIST, SocksPolicy, NULL),
VAR("SocksPort", UINT, SocksPort, "9050"),
+ VAR("SocksTimeout", INTERVAL, SocksTimeout, "2 minutes"),
/* if StatusFetchPeriod is 0, see get_status_fetch_period() in main.c */
VAR("StatusFetchPeriod", INTERVAL, StatusFetchPeriod, "0 seconds"),
VAR("StrictEntryNodes", BOOL, StrictEntryNodes, "0"),