From 18bfa4bfb3bb875c36756272bb653c33e338c776 Mon Sep 17 00:00:00 2001 From: Vincent Bernat <bernat@luffy.cx> Date: Thu, 2 Aug 2012 05:33:56 +0000 Subject: conntrackd: don't resync expectations if such sync has been disabled conntrackd was segfaulting with `ExpectationSync` set to `Off` and PollSecs (polling mode) in use. Signed-off-by: Vincent Bernat <bernat@luffy.cx> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- src/ctnl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ctnl.c b/src/ctnl.c index 107cd5d..bb54727 100644 --- a/src/ctnl.c +++ b/src/ctnl.c @@ -164,7 +164,9 @@ static void do_polling_alarm(struct alarm_block *a, void *data) STATE(mode)->internal->exp.purge(); nl_send_resync(STATE(resync)); - nl_send_expect_resync(STATE(resync)); + if (CONFIG(flags) & CTD_EXPECT) + nl_send_expect_resync(STATE(resync)); + add_alarm(&STATE(polling_alarm), CONFIG(poll_kernel_secs), 0); } -- cgit v1.2.3