* [PATCH] conntrackd: don't resync expectations if such sync has been disabled
@ 2012-08-02 15:33 Vincent Bernat
2012-08-03 9:02 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Vincent Bernat @ 2012-08-02 15:33 UTC (permalink / raw)
To: netfilter-devel; +Cc: Vincent Bernat
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] conntrackd: don't resync expectations if such sync has been disabled
2012-08-02 15:33 [PATCH] conntrackd: don't resync expectations if such sync has been disabled Vincent Bernat
@ 2012-08-03 9:02 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2012-08-03 9:02 UTC (permalink / raw)
To: Vincent Bernat; +Cc: netfilter-devel
On Thu, Aug 02, 2012 at 05:33:56PM +0200, Vincent Bernat wrote:
> 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));
Applied (with little change to fix coding style).
Thanks Vincent.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-03 9:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-02 15:33 [PATCH] conntrackd: don't resync expectations if such sync has been disabled Vincent Bernat
2012-08-03 9:02 ` Pablo Neira Ayuso
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).