|
|
@@ -1,108 +0,0 @@
|
|
1
|
|
-From 30e24dbfc7a8644e29664070e8c16e5c3997f87e Mon Sep 17 00:00:00 2001
|
|
2
|
|
-From: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
3
|
|
-Date: Fri, 7 Nov 2014 18:33:01 +0100
|
|
4
|
|
-Subject: [PATCH] include: keep a copy of linux/netfilter_ipv4/ipt_ULOG.h
|
|
5
|
|
-
|
|
6
|
|
-This fixes compilation if you use a Linux kernel >= 3.17. This problem
|
|
7
|
|
-occurs since ULOG was removed from mainstream:
|
|
8
|
|
-
|
|
9
|
|
-http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7200135bc1e61f1437dc326ae2ef2f310c50b4eb
|
|
10
|
|
-
|
|
11
|
|
-Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=986
|
|
12
|
|
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
13
|
|
----
|
|
14
|
|
- configure.ac | 2 +-
|
|
15
|
|
- include/linux/Makefile.am | 4 +--
|
|
16
|
|
- include/linux/netfilter_ipv4/Makefile.am | 1 +
|
|
17
|
|
- include/linux/netfilter_ipv4/ipt_ULOG.h | 49 ++++++++++++++++++++++++++++++++
|
|
18
|
|
- 4 files changed, 53 insertions(+), 3 deletions(-)
|
|
19
|
|
- create mode 100644 include/linux/netfilter_ipv4/Makefile.am
|
|
20
|
|
- create mode 100644 include/linux/netfilter_ipv4/ipt_ULOG.h
|
|
21
|
|
-
|
|
22
|
|
-diff --git a/configure.ac b/configure.ac
|
|
23
|
|
-index 522c345..c5f573c 100644
|
|
24
|
|
---- a/configure.ac
|
|
25
|
|
-+++ b/configure.ac
|
|
26
|
|
-@@ -142,7 +142,7 @@ dnl AM_CONDITIONAL(HAVE_PGSQL, test x$pgsqldir != x)
|
|
27
|
|
-
|
|
28
|
|
- AC_CONFIG_FILES(include/Makefile include/ulogd/Makefile include/libipulog/Makefile \
|
|
29
|
|
- include/linux/Makefile include/linux/netfilter/Makefile \
|
|
30
|
|
-- libipulog/Makefile \
|
|
31
|
|
-+ include/linux/netfilter_ipv4/Makefile libipulog/Makefile \
|
|
32
|
|
- input/Makefile input/packet/Makefile input/flow/Makefile \
|
|
33
|
|
- input/sum/Makefile \
|
|
34
|
|
- filter/Makefile filter/raw2packet/Makefile filter/packet2flow/Makefile \
|
|
35
|
|
-diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
|
|
36
|
|
-index ca80d0d..18af1c2 100644
|
|
37
|
|
---- a/include/linux/Makefile.am
|
|
38
|
|
-+++ b/include/linux/Makefile.am
|
|
39
|
|
-@@ -1,2 +1,2 @@
|
|
40
|
|
--
|
|
41
|
|
--SUBDIRS = netfilter
|
|
42
|
|
-+SUBDIRS = netfilter \
|
|
43
|
|
-+ netfilter_ipv4
|
|
44
|
|
-diff --git a/include/linux/netfilter_ipv4/Makefile.am b/include/linux/netfilter_ipv4/Makefile.am
|
|
45
|
|
-new file mode 100644
|
|
46
|
|
-index 0000000..41819a3
|
|
47
|
|
---- /dev/null
|
|
48
|
|
-+++ b/include/linux/netfilter_ipv4/Makefile.am
|
|
49
|
|
-@@ -0,0 +1 @@
|
|
50
|
|
-+noinst_HEADERS = ipt_ULOG.h
|
|
51
|
|
-diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h
|
|
52
|
|
-new file mode 100644
|
|
53
|
|
-index 0000000..417aad2
|
|
54
|
|
---- /dev/null
|
|
55
|
|
-+++ b/include/linux/netfilter_ipv4/ipt_ULOG.h
|
|
56
|
|
-@@ -0,0 +1,49 @@
|
|
57
|
|
-+/* Header file for IP tables userspace logging, Version 1.8
|
|
58
|
|
-+ *
|
|
59
|
|
-+ * (C) 2000-2002 by Harald Welte <laforge@gnumonks.org>
|
|
60
|
|
-+ *
|
|
61
|
|
-+ * Distributed under the terms of GNU GPL */
|
|
62
|
|
-+
|
|
63
|
|
-+#ifndef _IPT_ULOG_H
|
|
64
|
|
-+#define _IPT_ULOG_H
|
|
65
|
|
-+
|
|
66
|
|
-+#ifndef NETLINK_NFLOG
|
|
67
|
|
-+#define NETLINK_NFLOG 5
|
|
68
|
|
-+#endif
|
|
69
|
|
-+
|
|
70
|
|
-+#define ULOG_DEFAULT_NLGROUP 1
|
|
71
|
|
-+#define ULOG_DEFAULT_QTHRESHOLD 1
|
|
72
|
|
-+
|
|
73
|
|
-+#define ULOG_MAC_LEN 80
|
|
74
|
|
-+#define ULOG_PREFIX_LEN 32
|
|
75
|
|
-+
|
|
76
|
|
-+#define ULOG_MAX_QLEN 50
|
|
77
|
|
-+/* Why 50? Well... there is a limit imposed by the slab cache 131000
|
|
78
|
|
-+ * bytes. So the multipart netlink-message has to be < 131000 bytes.
|
|
79
|
|
-+ * Assuming a standard ethernet-mtu of 1500, we could define this up
|
|
80
|
|
-+ * to 80... but even 50 seems to be big enough. */
|
|
81
|
|
-+
|
|
82
|
|
-+/* private data structure for each rule with a ULOG target */
|
|
83
|
|
-+struct ipt_ulog_info {
|
|
84
|
|
-+ unsigned int nl_group;
|
|
85
|
|
-+ size_t copy_range;
|
|
86
|
|
-+ size_t qthreshold;
|
|
87
|
|
-+ char prefix[ULOG_PREFIX_LEN];
|
|
88
|
|
-+};
|
|
89
|
|
-+
|
|
90
|
|
-+/* Format of the ULOG packets passed through netlink */
|
|
91
|
|
-+typedef struct ulog_packet_msg {
|
|
92
|
|
-+ unsigned long mark;
|
|
93
|
|
-+ long timestamp_sec;
|
|
94
|
|
-+ long timestamp_usec;
|
|
95
|
|
-+ unsigned int hook;
|
|
96
|
|
-+ char indev_name[IFNAMSIZ];
|
|
97
|
|
-+ char outdev_name[IFNAMSIZ];
|
|
98
|
|
-+ size_t data_len;
|
|
99
|
|
-+ char prefix[ULOG_PREFIX_LEN];
|
|
100
|
|
-+ unsigned char mac_len;
|
|
101
|
|
-+ unsigned char mac[ULOG_MAC_LEN];
|
|
102
|
|
-+ unsigned char payload[0];
|
|
103
|
|
-+} ulog_packet_msg_t;
|
|
104
|
|
-+
|
|
105
|
|
-+#endif /*_IPT_ULOG_H*/
|
|
106
|
|
-2.3.0
|
|
107
|
|
-
|
Nicolas Thill
9 лет назад