From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 386FEC07E96 for ; Tue, 6 Jul 2021 22:47:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0FFF361CA8 for ; Tue, 6 Jul 2021 22:47:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229781AbhGFWtj (ORCPT ); Tue, 6 Jul 2021 18:49:39 -0400 Received: from mail.netfilter.org ([217.70.188.207]:52798 "EHLO mail.netfilter.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229753AbhGFWti (ORCPT ); Tue, 6 Jul 2021 18:49:38 -0400 Received: from netfilter.org (unknown [90.77.255.23]) by mail.netfilter.org (Postfix) with ESMTPSA id A7DA96164E; Wed, 7 Jul 2021 00:46:47 +0200 (CEST) Date: Wed, 7 Jul 2021 00:46:57 +0200 From: Pablo Neira Ayuso To: Duncan Roe Cc: netfilter-devel@vger.kernel.org Subject: Re: [PATCH libnetfilter_queue v2] src: annotation: Correctly identify item for which header is needed Message-ID: <20210706224657.GA12859@salvia> References: <20210706013656.10833-1-duncan_roe@optusnet.com.au> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210706013656.10833-1-duncan_roe@optusnet.com.au> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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 > --- > 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 > > -/* only for NFQA_CT, not needed otherwise: */ > +/* NFQA_CT requires CTA_* attributes defined in nfnetlink_conntrack.h */ > #include > > 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. > @@ -46,11 +46,11 @@ enum nfqnl_attr_type { > NFQA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */ > NFQA_HWADDR, /* nfqnl_msg_packet_hw */ > NFQA_PAYLOAD, /* opaque data payload */ > - NFQA_CT, /* nf_conntrack_netlink.h */ > + NFQA_CT, /* nfnetlink_conntrack.h */ > NFQA_CT_INFO, /* enum ip_conntrack_info */ > NFQA_CAP_LEN, /* __u32 length of captured packet */ > NFQA_SKB_INFO, /* __u32 skb meta information */ > - NFQA_EXP, /* nf_conntrack_netlink.h */ > + NFQA_EXP, /* nfnetlink_conntrack.h */ > NFQA_UID, /* __u32 sk uid */ > NFQA_GID, /* __u32 sk gid */ > NFQA_SECCTX, /* security context string */ > diff --git a/include/linux/netfilter/nfnetlink_queue.h b/include/linux/netfilter/nfnetlink_queue.h > index 030672d..8e2e469 100644 > --- a/include/linux/netfilter/nfnetlink_queue.h > +++ b/include/linux/netfilter/nfnetlink_queue.h > @@ -42,11 +42,11 @@ enum nfqnl_attr_type { > NFQA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */ > NFQA_HWADDR, /* nfqnl_msg_packet_hw */ > NFQA_PAYLOAD, /* opaque data payload */ > - NFQA_CT, /* nf_conntrack_netlink.h */ > + NFQA_CT, /* nfnetlink_conntrack.h */ > NFQA_CT_INFO, /* enum ip_conntrack_info */ > NFQA_CAP_LEN, /* __u32 length of captured packet */ > NFQA_SKB_INFO, /* __u32 skb meta information */ > - NFQA_EXP, /* nf_conntrack_netlink.h */ > + NFQA_EXP, /* nfnetlink_conntrack.h */ > NFQA_UID, /* __u32 sk uid */ > NFQA_GID, /* __u32 sk gid */ > NFQA_SECCTX, > -- > 2.17.5 >