netfilter: kill ulog targets

This has been marked as deprecated for quite some time and the NFLOG target replacement has been also available since 2006.

Pablo Neira Ayuso committed 12 years ago

Commit 72001351 parent 95005078 files · +0 −1015Browse files

Showing the changes to include/uapi/linux (4 of 8 files). Show all

Unified · Split

4 files

@@ -14,6 +14,5 @@ header-y += ebt_nflog.h · 13 unmodified lines
14	header-y += ebt_pkttype.h	14	header-y += ebt_pkttype.h
15	header-y += ebt_redirect.h	15	header-y += ebt_redirect.h
16	header-y += ebt_stp.h	16	header-y += ebt_stp.h
17	header-y += ebt_ulog.h
18	header-y += ebt_vlan.h	17	header-y += ebt_vlan.h
19	header-y += ebtables.h	18	header-y += ebtables.h

@@ -1,38 +0,0 @@
1	#ifndef _EBT_ULOG_H
2	#define _EBT_ULOG_H
3
4	#include <linux/types.h>
5
6	#define EBT_ULOG_DEFAULT_NLGROUP 0
7	#define EBT_ULOG_DEFAULT_QTHRESHOLD 1
8	#define EBT_ULOG_MAXNLGROUPS 32 /* hardcoded netlink max */
9	#define EBT_ULOG_PREFIX_LEN 32
10	#define EBT_ULOG_MAX_QLEN 50
11	#define EBT_ULOG_WATCHER "ulog"
12	#define EBT_ULOG_VERSION 1
13
14	struct ebt_ulog_info {
15	__u32 nlgroup;
16	unsigned int cprange;
17	unsigned int qthreshold;
18	char prefix[EBT_ULOG_PREFIX_LEN];
19	};
20
21	typedef struct ebt_ulog_packet_msg {
22	int version;
23	char indev[IFNAMSIZ];
24	char outdev[IFNAMSIZ];
25	char physindev[IFNAMSIZ];
26	char physoutdev[IFNAMSIZ];
27	char prefix[EBT_ULOG_PREFIX_LEN];
28	struct timeval stamp;
29	unsigned long mark;
30	unsigned int hook;
31	size_t data_len;
32	/* The complete packet, including Ethernet header and perhaps
33	* the VLAN header is appended */
34	unsigned char data[0] __attribute__
35	((aligned (__alignof__(struct ebt_ulog_info))));
36	} ebt_ulog_packet_msg_t;
37
38	#endif /* _EBT_ULOG_H */

@@ -5,7 +5,6 @@ header-y += ipt_ECN.h · 4 unmodified lines
5	header-y += ipt_LOG.h	5	header-y += ipt_LOG.h
6	header-y += ipt_REJECT.h	6	header-y += ipt_REJECT.h
7	header-y += ipt_TTL.h	7	header-y += ipt_TTL.h
8	header-y += ipt_ULOG.h
9	header-y += ipt_ah.h	8	header-y += ipt_ah.h
10	header-y += ipt_ecn.h	9	header-y += ipt_ecn.h
11	header-y += ipt_ttl.h	10	header-y += ipt_ttl.h

@@ -1,49 +0,0 @@
1	/* Header file for IP tables userspace logging, Version 1.8
2	*
3	* (C) 2000-2002 by Harald Welte <laforge@gnumonks.org>
4	*
5	* Distributed under the terms of GNU GPL */
6
7	#ifndef _IPT_ULOG_H
8	#define _IPT_ULOG_H
9
10	#ifndef NETLINK_NFLOG
11	#define NETLINK_NFLOG 5
12	#endif
13
14	#define ULOG_DEFAULT_NLGROUP 1
15	#define ULOG_DEFAULT_QTHRESHOLD 1
16
17	#define ULOG_MAC_LEN 80
18	#define ULOG_PREFIX_LEN 32
19
20	#define ULOG_MAX_QLEN 50
21	/* Why 50? Well... there is a limit imposed by the slab cache 131000
22	* bytes. So the multipart netlink-message has to be < 131000 bytes.
23	* Assuming a standard ethernet-mtu of 1500, we could define this up
24	* to 80... but even 50 seems to be big enough. */
25
26	/* private data structure for each rule with a ULOG target */
27	struct ipt_ulog_info {
28	unsigned int nl_group;
29	size_t copy_range;
30	size_t qthreshold;
31	char prefix[ULOG_PREFIX_LEN];
32	};
33
34	/* Format of the ULOG packets passed through netlink */
35	typedef struct ulog_packet_msg {
36	unsigned long mark;
37	long timestamp_sec;
38	long timestamp_usec;
39	unsigned int hook;
40	char indev_name[IFNAMSIZ];
41	char outdev_name[IFNAMSIZ];
42	size_t data_len;
43	char prefix[ULOG_PREFIX_LEN];
44	unsigned char mac_len;
45	unsigned char mac[ULOG_MAC_LEN];
46	unsigned char payload[0];
47	} ulog_packet_msg_t;
48
49	#endif /_IPT_ULOG_H/