From: Vincent Bernat <bernat@luffy.cx>
To: netfilter-devel@vger.kernel.org
Cc: Vincent Bernat <bernat@luffy.cx>
Subject: [PATCH] conntrackd: don't resync expectations if such sync has been disabled
Date: Thu, 2 Aug 2012 17:33:56 +0200 [thread overview]
Message-ID: <1343921636-6527-1-git-send-email-bernat@luffy.cx> (raw)
conntrackd was segfaulting with `ExpectationSync` set to `Off`.
Signed-off-by: Vincent Bernat <bernat@luffy.cx>
---
src/ctnl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ctnl.c b/src/ctnl.c
index 107cd5d..154b612 100644
--- a/src/ctnl.c
+++ b/src/ctnl.c
@@ -164,7 +164,7 @@ 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);
}
--
1.7.10.4
next reply other threads:[~2012-08-02 15:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-02 15:33 Vincent Bernat [this message]
2012-08-03 9:02 ` [PATCH] conntrackd: don't resync expectations if such sync has been disabled Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343921636-6527-1-git-send-email-bernat@luffy.cx \
--to=bernat@luffy.cx \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).