include: deprecate libnetfilter_queue/linux_nfnetlink_queue.h
Pablo Neira Ayuso
maintainerPATCH 1/1 include: deprecate libnetfilter_queue/linux_nfnetlink_queue.h
Emit a warning to notify users that this file is deprecated.
--- include/libnetfilter_queue/libnetfilter_queue.h | 2 -- include/libnetfilter_queue/linux_nfnetlink_queue.h | 2 ++ src/libnetfilter_queue.c | 1 + utils/nfqnl_test.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-)
include/libnetfilter_queue/libnetfilter_queue.h +0 -2
@@ -16,8 +16,6 @@#include <sys/time.h> #include <libnfnetlink/libnfnetlink.h> -#include <libnetfilter_queue/linux_nfnetlink_queue.h> -#ifdef __cplusplusextern "C" {#endif
include/libnetfilter_queue/linux_nfnetlink_queue.h +2 -0
@@ -1,6 +1,8 @@#ifndef _NFNETLINK_QUEUE_H#define _NFNETLINK_QUEUE_H +#warning "#include <libnetfilter_queue/linux_nfnetlink_queue.h> is deprecated, use #include <linux/netfilter/nfnetlink_queue.h> instead." +#ifndef aligned_u64#define aligned_u64 unsigned long long __attribute__((aligned(8)))#endif
src/libnetfilter_queue.c +1 -0
@@ -29,6 +29,7 @@#include <errno.h> #include <netinet/in.h> #include <sys/socket.h> +#include <linux/netfilter/nfnetlink_queue.h> #include <libnfnetlink/libnfnetlink.h> #include <libnetfilter_queue/libnetfilter_queue.h>
utils/nfqnl_test.c +1 -0
@@ -5,6 +5,7 @@#include <netinet/in.h> #include <linux/types.h> #include <linux/netfilter.h> /* for NF_ACCEPT */ +#include <linux/netfilter/nfnetlink_queue.h> #include <errno.h> #include <libnetfilter_queue/libnetfilter_queue.h>
Signature · 1 line
2.20.1
Hi Pablo,
Quoted 61 lines · Pablo Neira Ayuso
Emit a warning to notify users that this file is deprecated.
Signed-off-by Pablo Neira Ayuso <[email protected]>--- include/libnetfilter_queue/libnetfilter_queue.h | 2 -- include/libnetfilter_queue/linux_nfnetlink_queue.h | 2 ++ src/libnetfilter_queue.c | 1 + utils/nfqnl_test.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-)include/libnetfilter_queue/libnetfilter_queue.h +0
-2@@ -16,8 +16,6 @@#include <sys/time.h> #include <libnfnetlink/libnfnetlink.h> -#include <libnetfilter_queue/linux_nfnetlink_queue.h> -#ifdef __cplusplusextern "C" {#endif include/libnetfilter_queue/linux_nfnetlink_queue.h +2
-0@@ -1,6 +1,8 @@#ifndef _NFNETLINK_QUEUE_H#define _NFNETLINK_QUEUE_H +#warning "#include <libnetfilter_queue/linux_nfnetlink_queue.h> is deprecated, use #include <linux/netfilter/nfnetlink_queue.h> instead." +#ifndef aligned_u64#define aligned_u64 unsigned long long __attribute__((aligned(8)))#endif src/libnetfilter_queue.c +1
-0@@ -29,6 +29,7 @@#include <errno.h> #include <netinet/in.h> #include <sys/socket.h> +#include <linux/netfilter/nfnetlink_queue.h> #include <libnfnetlink/libnfnetlink.h> #include <libnetfilter_queue/libnetfilter_queue.h> utils/nfqnl_test.c +1
-1@@ -5,6 +5,7 @@#include <netinet/in.h> #include <linux/types.h> #include <linux/netfilter.h> /* for NF_ACCEPT */ +#include <linux/netfilter/nfnetlink_queue.h> #include <errno.h> #include <libnetfilter_queue/libnetfilter_queue.h> --
Quoted 2 lines
2.20.1
Suggest you leave include/libnetfilter_queue/libnetfilter_queue.h unaltered.
That way, if a user fails to insert linux/netfilter/nfnetlink_queue.h at all, he will get the warning. With the patched libnetfilter_queue.h, he will get compilation errors where previously he did not.
Otherwise all good.
BTW if a user doesn't have kernel headers he's in for a hard time anyway: the verdict helpers need linux/netfilter.h for NF_ACCEPT &c.
Cheers ... Duncan.
Pablo Neira Ayuso
maintainerOn Wed, Aug 11, 2021 at 04:21:40PM +1000, Duncan Roe wrote:
[...]
Quoted 5 lines
Suggest you leave
include/libnetfilter_queue/libnetfilter_queue.hunaltered.That way, if a user fails to insert
linux/netfilter/nfnetlink_queue.hat all, he will get the warning. With the patchedlibnetfilter_queue.h, he will get compilation errors where previously he did not.
OK, done and pushed it out. Thanks.
Quoted 9 lines · Pablo Neira Ayuso
On Wed, Aug 11, 2021 at 04:21:40PM +1000, Duncan Roe wrote:
[...]Quoted 5 lines
Suggest you leave
include/libnetfilter_queue/libnetfilter_queue.hunaltered.That way, if a user fails to insert
linux/netfilter/nfnetlink_queue.hat all, he will get the warning. With the patchedlibnetfilter_queue.h, he will get compilation errors where previously he did not.OK, done and pushed it out. Thanks.
You really didn't need all these extra #include lines. The only source that doesn't compile with "#include <libnetfilter_queue/linux_nfnetlink_queue.h>" removed from libnetfilter_queue.h is libnetfilter_queue.c.
So, only src/libnetfilter_queue.c needed
"#include <linux/netfilter/nfnetlink_queue.h>". If in the future any of the others were changed so nfnetlink_queue.h *was* required, the person doing the change would get the warning and insert the #include then.
Worth a v2?
Cheers ... Duncan.
Pablo Neira Ayuso
maintainerQuoted 9 lines · Duncan Roe
Quoted 8 lines · Pablo Neira Ayuso
On Wed, Aug 11, 2021 at 04:21:40PM +1000, Duncan Roe wrote:
[...]Quoted 5 lines
Suggest you leave
include/libnetfilter_queue/libnetfilter_queue.hunaltered.That way, if a user fails to insert
linux/netfilter/nfnetlink_queue.hat all, he will get the warning. With the patchedlibnetfilter_queue.h, he will get compilation errors where previously he did not.
Quoted 5 lines
Quoted 1 line
OK, done and pushed it out. Thanks.
You really didn't need all these extra #include lines. The only source that doesn't compile with "#include <
libnetfilter_queue/linux_nfnetlink_queue.h>" removed fromlibnetfilter_queue.hislibnetfilter_queue.c.
Those are needed, otherwise libnetfilter_queue emits warnings all over the place.
Quoted 10 lines · Pablo Neira Ayuso
Quoted 9 lines · Duncan Roe
Quoted 8 lines · Pablo Neira Ayuso
On Wed, Aug 11, 2021 at 04:21:40PM +1000, Duncan Roe wrote:
[...]Quoted 5 lines
Suggest you leave
include/libnetfilter_queue/libnetfilter_queue.hunaltered.That way, if a user fails to insert
linux/netfilter/nfnetlink_queue.hat all, he will get the warning. With the patchedlibnetfilter_queue.h, he will get compilation errors where previously he did not.
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
OK, done and pushed it out. Thanks.
You really didn't need all these extra #include lines. The only source that doesn't compile with "#include <
libnetfilter_queue/linux_nfnetlink_queue.h>" removed fromlibnetfilter_queue.hislibnetfilter_queue.c.Those are needed, otherwise
libnetfilter_queueemits warnings all over the place.
Of course, thank you. I'll send a v3 of "Insert SYNOPSIS sections for man pages"
Cheers ... Duncan.