netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Vincent Bernat <bernat@luffy.cx>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH] conntrackd: don't resync expectations if such sync has been disabled
Date: Fri, 3 Aug 2012 11:02:18 +0200	[thread overview]
Message-ID: <20120803090218.GB9363@1984> (raw)
In-Reply-To: <1343921636-6527-1-git-send-email-bernat@luffy.cx>

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.

      reply	other threads:[~2012-08-03  9:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

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=20120803090218.GB9363@1984 \
    --to=pablo@netfilter.org \
    --cc=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).