|
 |
5463f77 |
From 3311bf0d0fefd845d8d1d01b178bcd6701473a43 Mon Sep 17 00:00:00 2001
|
|
|
5463f77 |
From: Phil Sutter <phil@nwl.cc>
|
|
|
5463f77 |
Date: Wed, 22 Feb 2023 16:36:16 +0100
|
|
|
5463f77 |
Subject: [PATCH] include: Add missing linux/netfilter/xt_LOG.h
|
|
|
5463f77 |
|
|
|
5463f77 |
When merging IP-version-specific LOG extensions, a dependency to that
|
|
|
5463f77 |
header was introduced without caching it. Fix this and drop the now
|
|
|
5463f77 |
unused ip{,6}t_LOG.h files.
|
|
|
5463f77 |
|
|
|
5463f77 |
Reported-by: Thomas Devoogdt <thomas@devoogdt.com>
|
|
|
5463f77 |
Fixes: 87e4f1bf0b87b ("extensions: libip*t_LOG: Merge extensions")
|
|
|
5463f77 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
5463f77 |
(cherry picked from commit 8030e5444681e16ac2f481ddad73e33fab376147)
|
|
|
5463f77 |
---
|
|
|
5463f77 |
include/linux/netfilter/xt_LOG.h | 20 ++++++++++++++++++++
|
|
|
5463f77 |
include/linux/netfilter_ipv4/ipt_LOG.h | 19 -------------------
|
|
|
5463f77 |
include/linux/netfilter_ipv6/ip6t_LOG.h | 19 -------------------
|
|
|
5463f77 |
3 files changed, 20 insertions(+), 38 deletions(-)
|
|
|
5463f77 |
create mode 100644 include/linux/netfilter/xt_LOG.h
|
|
|
5463f77 |
delete mode 100644 include/linux/netfilter_ipv4/ipt_LOG.h
|
|
|
5463f77 |
delete mode 100644 include/linux/netfilter_ipv6/ip6t_LOG.h
|
|
|
5463f77 |
|
|
|
5463f77 |
diff --git a/include/linux/netfilter/xt_LOG.h b/include/linux/netfilter/xt_LOG.h
|
|
|
5463f77 |
new file mode 100644
|
|
|
5463f77 |
index 0000000000000..167d4ddd2476b
|
|
|
5463f77 |
--- /dev/null
|
|
|
5463f77 |
+++ b/include/linux/netfilter/xt_LOG.h
|
|
|
5463f77 |
@@ -0,0 +1,20 @@
|
|
|
5463f77 |
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
|
|
5463f77 |
+#ifndef _XT_LOG_H
|
|
|
5463f77 |
+#define _XT_LOG_H
|
|
|
5463f77 |
+
|
|
|
5463f77 |
+/* make sure not to change this without changing nf_log.h:NF_LOG_* (!) */
|
|
|
5463f77 |
+#define XT_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */
|
|
|
5463f77 |
+#define XT_LOG_TCPOPT 0x02 /* Log TCP options */
|
|
|
5463f77 |
+#define XT_LOG_IPOPT 0x04 /* Log IP options */
|
|
|
5463f77 |
+#define XT_LOG_UID 0x08 /* Log UID owning local socket */
|
|
|
5463f77 |
+#define XT_LOG_NFLOG 0x10 /* Unsupported, don't reuse */
|
|
|
5463f77 |
+#define XT_LOG_MACDECODE 0x20 /* Decode MAC header */
|
|
|
5463f77 |
+#define XT_LOG_MASK 0x2f
|
|
|
5463f77 |
+
|
|
|
5463f77 |
+struct xt_log_info {
|
|
|
5463f77 |
+ unsigned char level;
|
|
|
5463f77 |
+ unsigned char logflags;
|
|
|
5463f77 |
+ char prefix[30];
|
|
|
5463f77 |
+};
|
|
|
5463f77 |
+
|
|
|
5463f77 |
+#endif /* _XT_LOG_H */
|
|
|
5463f77 |
diff --git a/include/linux/netfilter_ipv4/ipt_LOG.h b/include/linux/netfilter_ipv4/ipt_LOG.h
|
|
|
5463f77 |
deleted file mode 100644
|
|
|
5463f77 |
index dcdbadf9fd4a9..0000000000000
|
|
|
5463f77 |
--- a/include/linux/netfilter_ipv4/ipt_LOG.h
|
|
|
5463f77 |
+++ /dev/null
|
|
|
5463f77 |
@@ -1,19 +0,0 @@
|
|
|
5463f77 |
-#ifndef _IPT_LOG_H
|
|
|
5463f77 |
-#define _IPT_LOG_H
|
|
|
5463f77 |
-
|
|
|
5463f77 |
-/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
|
|
|
5463f77 |
-#define IPT_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */
|
|
|
5463f77 |
-#define IPT_LOG_TCPOPT 0x02 /* Log TCP options */
|
|
|
5463f77 |
-#define IPT_LOG_IPOPT 0x04 /* Log IP options */
|
|
|
5463f77 |
-#define IPT_LOG_UID 0x08 /* Log UID owning local socket */
|
|
|
5463f77 |
-#define IPT_LOG_NFLOG 0x10 /* Unsupported, don't reuse */
|
|
|
5463f77 |
-#define IPT_LOG_MACDECODE 0x20 /* Decode MAC header */
|
|
|
5463f77 |
-#define IPT_LOG_MASK 0x2f
|
|
|
5463f77 |
-
|
|
|
5463f77 |
-struct ipt_log_info {
|
|
|
5463f77 |
- unsigned char level;
|
|
|
5463f77 |
- unsigned char logflags;
|
|
|
5463f77 |
- char prefix[30];
|
|
|
5463f77 |
-};
|
|
|
5463f77 |
-
|
|
|
5463f77 |
-#endif /*_IPT_LOG_H*/
|
|
|
5463f77 |
diff --git a/include/linux/netfilter_ipv6/ip6t_LOG.h b/include/linux/netfilter_ipv6/ip6t_LOG.h
|
|
|
5463f77 |
deleted file mode 100644
|
|
|
5463f77 |
index 9dd5579e02ec7..0000000000000
|
|
|
5463f77 |
--- a/include/linux/netfilter_ipv6/ip6t_LOG.h
|
|
|
5463f77 |
+++ /dev/null
|
|
|
5463f77 |
@@ -1,19 +0,0 @@
|
|
|
5463f77 |
-#ifndef _IP6T_LOG_H
|
|
|
5463f77 |
-#define _IP6T_LOG_H
|
|
|
5463f77 |
-
|
|
|
5463f77 |
-/* make sure not to change this without changing netfilter.h:NF_LOG_* (!) */
|
|
|
5463f77 |
-#define IP6T_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */
|
|
|
5463f77 |
-#define IP6T_LOG_TCPOPT 0x02 /* Log TCP options */
|
|
|
5463f77 |
-#define IP6T_LOG_IPOPT 0x04 /* Log IP options */
|
|
|
5463f77 |
-#define IP6T_LOG_UID 0x08 /* Log UID owning local socket */
|
|
|
5463f77 |
-#define IP6T_LOG_NFLOG 0x10 /* Unsupported, don't use */
|
|
|
5463f77 |
-#define IP6T_LOG_MACDECODE 0x20 /* Decode MAC header */
|
|
|
5463f77 |
-#define IP6T_LOG_MASK 0x2f
|
|
|
5463f77 |
-
|
|
|
5463f77 |
-struct ip6t_log_info {
|
|
|
5463f77 |
- unsigned char level;
|
|
|
5463f77 |
- unsigned char logflags;
|
|
|
5463f77 |
- char prefix[30];
|
|
|
5463f77 |
-};
|
|
|
5463f77 |
-
|
|
|
5463f77 |
-#endif /*_IPT_LOG_H*/
|
|
|
5463f77 |
--
|
|
|
5463f77 |
2.40.0
|
|
|
5463f77 |
|