summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2009-01-21 13:51:21 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2009-01-21 13:51:21 +0100
commit0cad5cba3e1f7b4295d0f98a1d9df3acdbb6f203 (patch)
treee92de7609622ccad6e3365fd37333125efa18c27 /src
parent4fb9c22f6e4ec2fadd22c0863137f211d9b392c4 (diff)
downloadconntrack-tools-0cad5cba3e1f7b4295d0f98a1d9df3acdbb6f203.tar.gz
conntrack-tools-0cad5cba3e1f7b4295d0f98a1d9df3acdbb6f203.zip
src: obsolete `DestroyTimeout' clause
This patch obsoletes `DestroyTimeout' which has no clients anymore. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r--src/read_config_yy.y7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/read_config_yy.y b/src/read_config_yy.y
index 97aa178..d71829f 100644
--- a/src/read_config_yy.y
+++ b/src/read_config_yy.y
@@ -556,7 +556,8 @@ window_size: T_WINDOWSIZE T_NUMBER
destroy_timeout: T_DESTROY_TIMEOUT T_NUMBER
{
- conf.del_timeout = $2;
+ fprintf(stderr, "WARNING: `DestroyTimeout' is deprecated. "
+ "Remove it.\n");
};
relax_transitions: T_RELAX_TRANSITIONS
@@ -1159,10 +1160,6 @@ init_config(char *filename)
if (CONFIG(window_size) == 0)
CONFIG(window_size) = 300;
- /* double of 120 seconds which is common timeout of a final state */
- if (conf.flags & CTD_SYNC_FTFW && CONFIG(del_timeout) == 0)
- CONFIG(del_timeout) = 240;
-
if (CONFIG(event_iterations_limit) == 0)
CONFIG(event_iterations_limit) = 100;