From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Duncan Roe <duncan_roe@optusnet.com.au>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH libnetfilter_queue v2] src: annotation: Correctly identify item for which header is needed
Date: Wed, 7 Jul 2021 00:46:57 +0200 [thread overview]
Message-ID: <20210706224657.GA12859@salvia> (raw)
In-Reply-To: <20210706013656.10833-1-duncan_roe@optusnet.com.au>
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.
> @@ -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
>
next prev parent reply other threads:[~2021-07-06 22:47 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
2021-07-06 1:36 ` [PATCH libnetfilter_queue v2] " Duncan Roe
2021-07-06 22:46 ` Pablo Neira Ayuso [this message]
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=20210706224657.GA12859@salvia \
--to=pablo@netfilter.org \
--cc=duncan_roe@optusnet.com.au \
--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).