From 6777a0bb68a83191f5bb78e4d7f7c909997b914b Mon Sep 17 00:00:00 2001 From: Heikki Hannikainen Date: Sat, 12 May 2012 21:11:56 +0000 Subject: [PATCH] = dupefilter_storetime is no longer a configurable item - fixed in 30 seconds, so that users can't accidentally break the standard = other sensible defaults too git-svn-id: http://repo.ham.fi/svn/aprsc/trunk@343 3ce903b1-3385-4e86-93cd-f9a4a239f7ac --- src/config.c | 9 ++++----- tests/cfg-aprsc/aggregator | 3 --- tests/cfg-aprsc/basic | 3 --- tests/cfg-aprsc/uplinks | 3 --- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/config.c b/src/config.c index ee2eb0d..8964a67 100644 --- a/src/config.c +++ b/src/config.c @@ -59,17 +59,17 @@ int dump_splay; /* print splay tree information */ int workers_configured = 2; /* number of workers to run */ -int expiry_interval = 10; +int expiry_interval = 30; int stats_interval = 1 * 60; int lastposition_storetime = 24*60*60; /* how long the last position packet of each station is stored */ -int dupefilter_storetime = 3*60; /* how long to store information required for dupe filtering */ +int dupefilter_storetime = 30; /* how long to store information required for dupe filtering */ int pbuf_global_expiration = 35*60; /* 35 minutes */ int pbuf_global_dupe_expiration = 10*60; /* 10 minutes */ -int upstream_timeout = 5*60; /* after N seconds of no input from an upstream, disconnect */ -int client_timeout = 60*60; /* after N seconds of no input from a client, disconnect */ +int upstream_timeout = 60; /* after N seconds of no input from an upstream, disconnect */ +int client_timeout = 30*60; /* after N seconds of no input from a client, disconnect */ int ibuf_size = 8100; /* size of input buffer for clients */ int obuf_size = 32*1024; /* size of output buffer for clients */ @@ -104,7 +104,6 @@ static struct cfgcmd cfg_cmds[] = { { "statsinterval", _CFUNC_ do_interval, &stats_interval }, { "expiryinterval", _CFUNC_ do_interval, &expiry_interval }, { "lastpositioncache", _CFUNC_ do_interval, &lastposition_storetime }, - { "dupefiltercache", _CFUNC_ do_interval, &dupefilter_storetime }, { "upstreamtimeout", _CFUNC_ do_interval, &upstream_timeout }, { "clienttimeout", _CFUNC_ do_interval, &client_timeout }, { "filelimit", _CFUNC_ do_int, &new_fileno_limit }, diff --git a/tests/cfg-aprsc/aggregator b/tests/cfg-aprsc/aggregator index 24cc158..39bdb3b 100644 --- a/tests/cfg-aprsc/aggregator +++ b/tests/cfg-aprsc/aggregator @@ -29,9 +29,6 @@ ExpiryInterval 30s # How long to cache last position of each station LastPositionCache 48h -# How long to cache duplicate filter entries (practically all packets) -DupeFilterCache 30s - # When no data is received from an upstream server in N seconds, switch to # another server UpstreamTimeout 10s diff --git a/tests/cfg-aprsc/basic b/tests/cfg-aprsc/basic index 8e23b2d..64b7d56 100644 --- a/tests/cfg-aprsc/basic +++ b/tests/cfg-aprsc/basic @@ -29,9 +29,6 @@ ExpiryInterval 30s # How long to cache last position of each station LastPositionCache 48h -# How long to cache duplicate filter entries (practically all packets) -DupeFilterCache 30s - # When no data is received from an upstream server in N seconds, switch to # another server UpstreamTimeout 10s diff --git a/tests/cfg-aprsc/uplinks b/tests/cfg-aprsc/uplinks index 25bd8c6..9e53d2a 100644 --- a/tests/cfg-aprsc/uplinks +++ b/tests/cfg-aprsc/uplinks @@ -29,9 +29,6 @@ ExpiryInterval 30s # How long to cache last position of each station LastPositionCache 48h -# How long to cache duplicate filter entries (practically all packets) -DupeFilterCache 30s - # When no data is received from an upstream server in N seconds, switch to # another server UpstreamTimeout 10s