Re: [PATCH libnetfilter_queue v2] src: annotation: Correctly identify item for which header is needed

[Pablo Neira Ayuso <pablo@netfilter.org>]

On Wed, Jul 07, 2021 at 10:01:50AM +1000, Duncan Roe wrote:
> On Wed, Jul 07, 2021 at 12:46:57AM +0200, Pablo Neira Ayuso wrote:
> > On Tue, Jul 06, 2021 at 11:36:56AM +1000, Duncan Roe wrote:
> > > Also fix header annotation to refer to nfnetlink_conntrack.h,
> > > not nf_conntrack_netlink.h
> >
> > Please, split this in two patches. See below. Thanks.
> >
> > > Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
> > > ---
> > >  examples/nf-queue.c                                | 2 +-
> > >  include/libnetfilter_queue/linux_nfnetlink_queue.h | 4 ++--
> > >  include/linux/netfilter/nfnetlink_queue.h          | 4 ++--
> > >  3 files changed, 5 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/examples/nf-queue.c b/examples/nf-queue.c
> > > index 3da2c24..5b86e69 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: */
> > > +/* NFQA_CT requires CTA_* attributes defined in nfnetlink_conntrack.h */
> > >  #include <linux/netfilter/nfnetlink_conntrack.h>
> > >
> > >  static struct mnl_socket *nl;
> >
> > This chunk belongs to libnetfilter_queue.
> >
> > > diff --git a/include/libnetfilter_queue/linux_nfnetlink_queue.h b/include/libnetfilter_queue/linux_nfnetlink_queue.h
> > > index 1975dfa..caa6788 100644
> > > --- a/include/libnetfilter_queue/linux_nfnetlink_queue.h
> > > +++ b/include/libnetfilter_queue/linux_nfnetlink_queue.h
> >
> > This chunk below, belongs to the nf tree. You have to fix first the
> > kernel UAPI, then you can refresh this copy that is stored in
> > libnetfilter_queue.
> 
> I already sent you an nf-next patch which you said you would forward to nf.

Yes, it can be applied to nf as I said since it is a fix, it needs
changes, I'm refering to this patch:

https://patchwork.ozlabs.org/project/netfilter-devel/patch/20210705123829.10090-1-duncan_roe@optusnet.com.au/

> I don't have the nf tree here but I guess the nf-next package will apply if
> I re-package.

The nf and nf-next trees look the same for nfnetlink_queue.h, you can
base your patch on either tree, just use [PATCH nf] to target this to
the nf git.

> Will send 3 patches as you request.

Thanks. I'll review them.