diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-01-21 13:51:21 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-01-21 13:51:21 +0100 |
| commit | 0cad5cba3e1f7b4295d0f98a1d9df3acdbb6f203 (patch) | |
| tree | e92de7609622ccad6e3365fd37333125efa18c27 | |
| parent | 4fb9c22f6e4ec2fadd22c0863137f211d9b392c4 (diff) | |
src: obsolete `DestroyTimeout' clause
This patch obsoletes `DestroyTimeout' which has no clients anymore.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | include/conntrackd.h | 1 | ||||
| -rw-r--r-- | src/read_config_yy.y | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/include/conntrackd.h b/include/conntrackd.h index eca6b76..99b9caa 100644 --- a/include/conntrackd.h +++ b/include/conntrackd.h @@ -78,7 +78,6 @@ struct ct_conf { int cache_timeout; /* cache entries timeout */ int commit_timeout; /* committed entries timeout */ unsigned int purge_timeout; /* purge kernel entries timeout */ - int del_timeout; unsigned int netlink_buffer_size; unsigned int netlink_buffer_size_max_grown; union inet_address *listen_to; 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; |