@@ -300,6 +300,7 @@ extern struct ct_mode stats_mode;
/* These live in run.c */
void killer(int foo);
+int evaluate(void);
int init(void);
void select_main_loop(void);
@@ -382,6 +382,17 @@ int main(int argc, char *argv[])
}
/*
+ * Evaluate configuration
+ */
+ if (evaluate() == -1) {
+ dlog(LOG_ERR, "conntrackd cannot start, please review your "
+ "configuration");
+ close_log();
+ unlink(CONFIG(lockfile));
+ exit(EXIT_FAILURE);
+ }
+
+ /*
* initialization process
*/
@@ -221,6 +221,19 @@ static void local_cb(void *data)
do_local_server_step(&STATE(local), NULL, local_handler);
}
+int evaluate(void)
+{
+ if (CONFIG(sync).external_cache_disable &&
+ CONFIG(commit_timeout)) {
+ dlog(LOG_WARNING, "`CommitTimeout' can't be combined with "
+ "`DisableExternalCache', ignoring this option. "
+ "Fix your configuration file.");
+ CONFIG(commit_timeout) = 0;
+ }
+
+ return 0;
+}
+
int
init(void)
{
This patch introduces a new evaluate() function that can be used to spot inconsistent configurations. Don't allow CommitTimeout with DisableExternalCache On since this results in EINVAL errors. CommitTimeout makes no sense with no external cache. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- include/conntrackd.h | 1 + src/main.c | 11 +++++++++++ src/run.c | 13 +++++++++++++ 3 files changed, 25 insertions(+)