* [PATCH libnetfilter_queue] src: annotation: Correctly identify item for which header is needed @ 2021-07-04 5:47 Duncan Roe 2021-07-05 8:52 ` Pablo Neira Ayuso 0 siblings, 1 reply; 12+ messages in thread From: Duncan Roe @ 2021-07-04 5:47 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel 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> static struct mnl_socket *nl; -- 2.17.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH libnetfilter_queue] src: annotation: Correctly identify item for which header is needed 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 0 siblings, 1 reply; 12+ messages in thread From: Pablo Neira Ayuso @ 2021-07-05 8:52 UTC (permalink / raw) To: Duncan Roe; +Cc: netfilter-devel 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: */ The reference to NFQA_CT is correct. enum nfqnl_attr_type { NFQA_UNSPEC, NFQA_PACKET_HDR, NFQA_VERDICT_HDR, /* nfqnl_msg_verdict_hrd */ NFQA_MARK, /* __u32 nfmark */ NFQA_TIMESTAMP, /* nfqnl_msg_packet_timestamp */ NFQA_IFINDEX_INDEV, /* __u32 ifindex */ NFQA_IFINDEX_OUTDEV, /* __u32 ifindex */ NFQA_IFINDEX_PHYSINDEV, /* __u32 ifindex */ NFQA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */ NFQA_HWADDR, /* nfqnl_msg_packet_hw */ NFQA_PAYLOAD, /* opaque data payload */ NFQA_CT, /* nf_conntrack_netlink.h */ NFQA_CT the attribute nest that contains the CTA_* attributes that represent the conntrack object, ie. NFQA_CT CTA_... CTA_... CTA_... ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH libnetfilter_queue] src: annotation: Correctly identify item for which header is needed 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 0 siblings, 2 replies; 12+ messages in thread From: Duncan Roe @ 2021-07-05 12:26 UTC (permalink / raw) To: Pablo Neira Ayuso; +Cc: Netfilter Development 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: */ In any case: > > enum nfqnl_attr_type { [...] > NFQA_CT, /* nf_conntrack_netlink.h */ > The header is nfnetlink_conntrack.h, not nf_conntrack_netlink.h. I can submit a v2 to also fix nf_conntrack_netlink in the cached headers. Cheers ... Duncan. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH libnetfilter_queue] src: annotation: Correctly identify item for which header is needed 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 1 sibling, 0 replies; 12+ messages in thread From: Pablo Neira Ayuso @ 2021-07-05 14:30 UTC (permalink / raw) To: Netfilter Development 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. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH libnetfilter_queue v2] src: annotation: Correctly identify item for which header is needed 2021-07-05 12:26 ` Duncan Roe 2021-07-05 14:30 ` Pablo Neira Ayuso @ 2021-07-06 1:36 ` Duncan Roe 2021-07-06 22:46 ` Pablo Neira Ayuso 1 sibling, 1 reply; 12+ messages in thread From: Duncan Roe @ 2021-07-06 1:36 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel Also fix header annotation to refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h 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; 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 @@ -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 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH libnetfilter_queue v2] src: annotation: Correctly identify item for which header is needed 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 ` (3 more replies) 0 siblings, 4 replies; 12+ messages in thread From: Pablo Neira Ayuso @ 2021-07-06 22:46 UTC (permalink / raw) To: Duncan Roe; +Cc: netfilter-devel 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 > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH libnetfilter_queue v2] src: annotation: Correctly identify item for which header is needed 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 ` (2 subsequent siblings) 3 siblings, 1 reply; 12+ messages in thread From: Duncan Roe @ 2021-07-07 0:01 UTC (permalink / raw) To: Pablo Neira Ayuso; +Cc: Netfilter Development 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. I don't have the nf tree here but I guess the nf-next package will apply if I re-package. Will send 3 patches as you request. Cheers ... Duncan. > > > @@ -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 > > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH libnetfilter_queue v2] src: annotation: Correctly identify item for which header is needed 2021-07-07 0:01 ` Duncan Roe @ 2021-07-07 0:05 ` Pablo Neira Ayuso 0 siblings, 0 replies; 12+ messages in thread From: Pablo Neira Ayuso @ 2021-07-07 0:05 UTC (permalink / raw) To: Netfilter Development 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. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH nf] netfilter: uapi: refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h 2021-07-06 22:46 ` Pablo Neira Ayuso 2021-07-07 0:01 ` Duncan Roe @ 2021-07-07 0:57 ` 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 3 siblings, 1 reply; 12+ messages in thread From: Duncan Roe @ 2021-07-07 0:57 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel nf_conntrack_netlink.h does not exist, refer to nfnetlink_conntrack.h instead. Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au> --- include/uapi/linux/netfilter/nfnetlink_log.h | 2 +- include/uapi/linux/netfilter/nfnetlink_queue.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/netfilter/nfnetlink_log.h b/include/uapi/linux/netfilter/nfnetlink_log.h index 45c8d3b027e0..0af9c113d665 100644 --- a/include/uapi/linux/netfilter/nfnetlink_log.h +++ b/include/uapi/linux/netfilter/nfnetlink_log.h @@ -61,7 +61,7 @@ enum nfulnl_attr_type { NFULA_HWTYPE, /* hardware type */ NFULA_HWHEADER, /* hardware header */ NFULA_HWLEN, /* hardware header length */ - NFULA_CT, /* nf_conntrack_netlink.h */ + NFULA_CT, /* nfnetlink_conntrack.h */ NFULA_CT_INFO, /* enum ip_conntrack_info */ NFULA_VLAN, /* nested attribute: packet vlan info */ NFULA_L2HDR, /* full L2 header */ diff --git a/include/uapi/linux/netfilter/nfnetlink_queue.h b/include/uapi/linux/netfilter/nfnetlink_queue.h index bcb2cb5d40b9..aed90c4df0c8 100644 --- a/include/uapi/linux/netfilter/nfnetlink_queue.h +++ b/include/uapi/linux/netfilter/nfnetlink_queue.h @@ -51,11 +51,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 */ -- 2.17.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH nf] netfilter: uapi: refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h 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 0 siblings, 0 replies; 12+ messages in thread From: Pablo Neira Ayuso @ 2021-07-07 15:40 UTC (permalink / raw) To: Duncan Roe; +Cc: netfilter-devel On Wed, Jul 07, 2021 at 10:57:51AM +1000, Duncan Roe wrote: > nf_conntrack_netlink.h does not exist, refer to nfnetlink_conntrack.h instead. Applied to nf, thanks. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH libnetfilter_queue] src: annotation: Correctly identify item for which header is needed 2021-07-06 22:46 ` Pablo Neira Ayuso 2021-07-07 0:01 ` Duncan Roe 2021-07-07 0:57 ` [PATCH nf] netfilter: uapi: refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h Duncan Roe @ 2021-07-07 1:17 ` Duncan Roe 2021-07-07 1:26 ` [PATCH libnetfilter_queue] include: refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h Duncan Roe 3 siblings, 0 replies; 12+ messages in thread From: Duncan Roe @ 2021-07-07 1:17 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel 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..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; -- 2.17.5 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH libnetfilter_queue] include: refer to nfnetlink_conntrack.h, not nf_conntrack_netlink.h 2021-07-06 22:46 ` Pablo Neira Ayuso ` (2 preceding siblings ...) 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 ` Duncan Roe 3 siblings, 0 replies; 12+ messages in thread From: Duncan Roe @ 2021-07-07 1:26 UTC (permalink / raw) To: pablo; +Cc: netfilter-devel nf_conntrack_netlink.h does not exist, refer to nfnetlink_conntrack.h instead. Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au> --- include/libnetfilter_queue/linux_nfnetlink_queue.h | 4 ++-- include/linux/netfilter/nfnetlink_queue.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 @@ -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 ^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-07-07 15:40 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 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 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
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.