summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2021-08-10 17:54:14 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2021-08-11 11:00:44 +0200
commit50b3846c1ea49580a6d2f6f68c98a3ffa2d75f88 (patch)
tree674a60417b28b12bed18a7326017fedef7693684
parent521252dc02e47700e5c9ca0d89edf57e44a87f8f (diff)
downloadlibnetfilter_queue-50b3846c1ea49580a6d2f6f68c98a3ffa2d75f88.tar.gz
include: deprecate libnetfilter_queue/linux_nfnetlink_queue.h
Emit a warning to notify users that this file is deprecated. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--include/libnetfilter_queue/linux_nfnetlink_queue.h2
-rw-r--r--src/extra/checksum.c1
-rw-r--r--src/extra/ipv4.c1
-rw-r--r--src/extra/ipv6.c1
-rw-r--r--src/extra/tcp.c1
-rw-r--r--src/extra/udp.c1
-rw-r--r--src/libnetfilter_queue.c1
-rw-r--r--utils/nfqnl_test.c1
8 files changed, 9 insertions, 0 deletions
diff --git a/include/libnetfilter_queue/linux_nfnetlink_queue.h b/include/libnetfilter_queue/linux_nfnetlink_queue.h
index caa6788..6844270 100644
--- a/include/libnetfilter_queue/linux_nfnetlink_queue.h
+++ b/include/libnetfilter_queue/linux_nfnetlink_queue.h
@@ -1,6 +1,8 @@
#ifndef _NFNETLINK_QUEUE_H
#define _NFNETLINK_QUEUE_H
+#warning "libnetfilter_queue/linux_nfnetlink_queue.h is deprecated, add #include <linux/netfilter/nfnetlink_queue.h> to your source code before #include <libnetfilter_queue/libnetfilter_queue.h>"
+
#ifndef aligned_u64
#define aligned_u64 unsigned long long __attribute__((aligned(8)))
#endif
diff --git a/src/extra/checksum.c b/src/extra/checksum.c
index ffc8c75..33480af 100644
--- a/src/extra/checksum.c
+++ b/src/extra/checksum.c
@@ -17,6 +17,7 @@
#include <netinet/ip6.h>
#include <netinet/tcp.h>
+#include <linux/netfilter/nfnetlink_queue.h>
#include <libnetfilter_queue/libnetfilter_queue.h>
#include "internal.h"
diff --git a/src/extra/ipv4.c b/src/extra/ipv4.c
index 797bab1..af4482d 100644
--- a/src/extra/ipv4.c
+++ b/src/extra/ipv4.c
@@ -14,6 +14,7 @@
#include <arpa/inet.h>
#include <netinet/ip.h>
+#include <linux/netfilter/nfnetlink_queue.h>
#include <libnetfilter_queue/libnetfilter_queue.h>
#include <libnetfilter_queue/libnetfilter_queue_ipv4.h>
#include <libnetfilter_queue/pktbuff.h>
diff --git a/src/extra/ipv6.c b/src/extra/ipv6.c
index 23f64ba..40b9950 100644
--- a/src/extra/ipv6.c
+++ b/src/extra/ipv6.c
@@ -15,6 +15,7 @@
#include <arpa/inet.h>
#include <netinet/ip6.h>
+#include <linux/netfilter/nfnetlink_queue.h>
#include <libnetfilter_queue/libnetfilter_queue.h>
#include <libnetfilter_queue/libnetfilter_queue_ipv6.h>
#include <libnetfilter_queue/pktbuff.h>
diff --git a/src/extra/tcp.c b/src/extra/tcp.c
index 933c6ee..01bfe8c 100644
--- a/src/extra/tcp.c
+++ b/src/extra/tcp.c
@@ -18,6 +18,7 @@
#define _GNU_SOURCE
#include <netinet/tcp.h>
+#include <linux/netfilter/nfnetlink_queue.h>
#include <libnetfilter_queue/libnetfilter_queue.h>
#include <libnetfilter_queue/libnetfilter_queue_tcp.h>
#include <libnetfilter_queue/libnetfilter_queue_ipv4.h>
diff --git a/src/extra/udp.c b/src/extra/udp.c
index f232127..ff91311 100644
--- a/src/extra/udp.c
+++ b/src/extra/udp.c
@@ -17,6 +17,7 @@
#define _GNU_SOURCE
#include <netinet/udp.h>
+#include <linux/netfilter/nfnetlink_queue.h>
#include <libnetfilter_queue/libnetfilter_queue.h>
#include <libnetfilter_queue/libnetfilter_queue_udp.h>
#include <libnetfilter_queue/libnetfilter_queue_ipv4.h>
diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c
index ef3b211..11a4e7c 100644
--- a/src/libnetfilter_queue.c
+++ b/src/libnetfilter_queue.c
@@ -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>
diff --git a/utils/nfqnl_test.c b/utils/nfqnl_test.c
index 5e76ffe..682f3d7 100644
--- a/utils/nfqnl_test.c
+++ b/utils/nfqnl_test.c
@@ -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>