netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Netfilter Development <netfilter-devel@vger.kernel.org>
Subject: Re: [PATCH libnetfilter_queue] src: annotation: Correctly identify item for which header is needed
Date: Mon, 5 Jul 2021 16:30:29 +0200	[thread overview]
Message-ID: <20210705143029.GA29924@salvia> (raw)
In-Reply-To: <YOL6jXNMeRGh+BlX@slk1.local.net>

On Mon, Jul 05, 2021 at 10:26:53PM +1000, Duncan Roe wrote:
> On Mon, Jul 05, 2021 at 10:52:46AM +0200, Pablo Neira Ayuso wrote:
> > On Sun, Jul 04, 2021 at 03:47:08PM +1000, Duncan Roe wrote:
> > > Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
> > > ---
> > >  examples/nf-queue.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/examples/nf-queue.c b/examples/nf-queue.c
> > > index 3da2c24..7d34081 100644
> > > --- a/examples/nf-queue.c
> > > +++ b/examples/nf-queue.c
> > > @@ -15,7 +15,7 @@
> > >
> > >  #include <libnetfilter_queue/libnetfilter_queue.h>
> > >
> > > -/* only for NFQA_CT, not needed otherwise: */
> > > +/* only for CTA_MARK, not needed otherwise: */
> >    #include <linux/netfilter/nfnetlink_conntrack.h>
> >
> > The reference to NFQA_CT is correct.
> 
> If I comment out the #include, the compiler complains about CTA_MARK. It does
> not complain about NFQA_CT. Perhaps:
> > -/* only for NFQA_CT, not needed otherwise: */
> > +/* only for conntrack attribute CTA_MARK, not needed otherwise: */

Maybe:

/* NFQA_CT requires CTA_* attributes defined in nfnetlink_conntrack.h */

> In any case:
> >
> > enum nfqnl_attr_type {
> [...]
> >         NFQA_CT,                        /* nf_conntrack_netlink.h */
> >
> The header is nfnetlink_conntrack.h, not nf_conntrack_netlink.h.

Good point.

> I can submit a v2 to also fix nf_conntrack_netlink in the cached headers.

Sure, go ahead.

  reply	other threads:[~2021-07-05 14:30 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-04  5:47 [PATCH libnetfilter_queue] src: annotation: Correctly identify item for which header is needed Duncan Roe
2021-07-05  8:52 ` Pablo Neira Ayuso
2021-07-05 12:26   ` Duncan Roe
2021-07-05 14:30     ` Pablo Neira Ayuso [this message]
2021-07-06  1:36     ` [PATCH libnetfilter_queue v2] " Duncan Roe
2021-07-06 22:46       ` Pablo Neira Ayuso
2021-07-07  0:01         ` Duncan Roe
2021-07-07  0:05           ` Pablo Neira Ayuso
2021-07-07  0:57         ` [PATCH nf] netfilter: uapi: refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h Duncan Roe
2021-07-07 15:40           ` Pablo Neira Ayuso
2021-07-07  1:17         ` [PATCH libnetfilter_queue] src: annotation: Correctly identify item for which header is needed Duncan Roe
2021-07-07  1:26         ` [PATCH libnetfilter_queue] include: refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h Duncan Roe

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=20210705143029.GA29924@salvia \
    --to=pablo@netfilter.org \
    --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).