UAPI: (Scripted) Disintegrate include/linux/netfilter_arp

Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>
author: David Howells <dhowells@redhat.com> 2012-10-09 04:48:56 -0400
committer: David Howells <dhowells@redhat.com> 2012-10-09 04:48:56 -0400
commit: 8922082ae6cd2783789e83ae9c67ffcbe5a2f4e1 (patch)
tree: 7b2b6598a0ddc7dbe6ebcc89f900366e5a748541
parent: a82014149becc68695e7f1d62a8cc1e4ae062318 (diff)
5 files changed, 209 insertions, 201 deletions
diff --git a/include/linux/netfilter_arp/Kbuild b/include/linux/netfilter_arp/Kbuild
index b27439c71037..e69de29bb2d1 100644
--- a/include/linux/netfilter_arp/Kbuild
+++ b/include/linux/netfilter_arp/Kbuild
@@ -1,2 +0,0 @@
-header-y += arp_tables.h
-header-y += arpt_mangle.h
diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h
index e08565d45178..cfb7191e6efa 100644
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
@@ -5,211 +5,14 @@
 *      network byte order.
 *      flags are stored in host byte order (of course).
 */
 #ifndef _ARPTABLES_H
 #define _ARPTABLES_H
-#ifdef __KERNEL__
 #include <linux/if.h>
 #include <linux/in.h>
 #include <linux/if_arp.h>
 #include <linux/skbuff.h>
-#endif
+#include <uapi/linux/netfilter_arp/arp_tables.h>
-#include <linux/types.h>
-#include <linux/compiler.h>
-#include <linux/netfilter_arp.h>
-#include <linux/netfilter/x_tables.h>
-#ifndef __KERNEL__
-#define ARPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
-#define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
-#define arpt_entry_target xt_entry_target
-#define arpt_standard_target xt_standard_target
-#define arpt_error_target xt_error_target
-#define ARPT_CONTINUE XT_CONTINUE
-#define ARPT_RETURN XT_RETURN
-#define arpt_counters_info xt_counters_info
-#define arpt_counters xt_counters
-#define ARPT_STANDARD_TARGET XT_STANDARD_TARGET
-#define ARPT_ERROR_TARGET XT_ERROR_TARGET
-#define ARPT_ENTRY_ITERATE(entries, size, fn, args...) \
-        XT_ENTRY_ITERATE(struct arpt_entry, entries, size, fn, ## args)
-#endif
-#define ARPT_DEV_ADDR_LEN_MAX 16
-struct arpt_devaddr_info {
-        char addr[ARPT_DEV_ADDR_LEN_MAX];
-        char mask[ARPT_DEV_ADDR_LEN_MAX];
-};
-/* Yes, Virginia, you have to zero the padding. */
-struct arpt_arp {
-        /* Source and target IP addr */
-        struct in_addr src, tgt;
-        /* Mask for src and target IP addr */
-        struct in_addr smsk, tmsk;
-        /* Device hw address length, src+target device addresses */
-        __u8 arhln, arhln_mask;
-        struct arpt_devaddr_info src_devaddr;
-        struct arpt_devaddr_info tgt_devaddr;
-        /* ARP operation code. */
-        __be16 arpop, arpop_mask;
-        /* ARP hardware address and protocol address format. */
-        __be16 arhrd, arhrd_mask;
-        __be16 arpro, arpro_mask;
-        /* The protocol address length is only accepted if it is 4
-         * so there is no use in offering a way to do filtering on it.
-         */
-        char iniface[IFNAMSIZ], outiface[IFNAMSIZ];
-        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
-        /* Flags word */
-        __u8 flags;
-        /* Inverse flags */
-        __u16 invflags;
-};
-/* Values for "flag" field in struct arpt_ip (general arp structure).
- * No flags defined yet.
- */
-#define ARPT_F_MASK             0x00    /* All possible flag bits mask. */
-/* Values for "inv" field in struct arpt_arp. */
-#define ARPT_INV_VIA_IN         0x0001  /* Invert the sense of IN IFACE. */
-#define ARPT_INV_VIA_OUT        0x0002  /* Invert the sense of OUT IFACE */
-#define ARPT_INV_SRCIP          0x0004  /* Invert the sense of SRC IP. */
-#define ARPT_INV_TGTIP          0x0008  /* Invert the sense of TGT IP. */
-#define ARPT_INV_SRCDEVADDR     0x0010  /* Invert the sense of SRC DEV ADDR. */
-#define ARPT_INV_TGTDEVADDR     0x0020  /* Invert the sense of TGT DEV ADDR. */
-#define ARPT_INV_ARPOP          0x0040  /* Invert the sense of ARP OP. */
-#define ARPT_INV_ARPHRD         0x0080  /* Invert the sense of ARP HRD. */
-#define ARPT_INV_ARPPRO         0x0100  /* Invert the sense of ARP PRO. */
-#define ARPT_INV_ARPHLN         0x0200  /* Invert the sense of ARP HLN. */
-#define ARPT_INV_MASK           0x03FF  /* All possible flag bits mask. */
-/* This structure defines each of the firewall rules.  Consists of 3
-   parts which are 1) general ARP header stuff 2) match specific
-   stuff 3) the target to perform if the rule matches */
-struct arpt_entry
-{
-        struct arpt_arp arp;
-        /* Size of arpt_entry + matches */
-        __u16 target_offset;
-        /* Size of arpt_entry + matches + target */
-        __u16 next_offset;
-        /* Back pointer */
-        unsigned int comefrom;
-        /* Packet and byte counters. */
-        struct xt_counters counters;
-        /* The matches (if any), then the target. */
-        unsigned char elems[0];
-};
-/*
- * New IP firewall options for [gs]etsockopt at the RAW IP level.
- * Unlike BSD Linux inherits IP options so you don't have to use a raw
- * socket for this. Instead we check rights in the calls.
- *
- * ATTENTION: check linux/in.h before adding new number here.
- */
-#define ARPT_BASE_CTL           96
-#define ARPT_SO_SET_REPLACE             (ARPT_BASE_CTL)
-#define ARPT_SO_SET_ADD_COUNTERS        (ARPT_BASE_CTL + 1)
-#define ARPT_SO_SET_MAX                 ARPT_SO_SET_ADD_COUNTERS
-#define ARPT_SO_GET_INFO                (ARPT_BASE_CTL)
-#define ARPT_SO_GET_ENTRIES             (ARPT_BASE_CTL + 1)
-/* #define ARPT_SO_GET_REVISION_MATCH   (APRT_BASE_CTL + 2) */
-#define ARPT_SO_GET_REVISION_TARGET     (ARPT_BASE_CTL + 3)
-#define ARPT_SO_GET_MAX                 (ARPT_SO_GET_REVISION_TARGET)
-/* The argument to ARPT_SO_GET_INFO */
-struct arpt_getinfo {
-        /* Which table: caller fills this in. */
-        char name[XT_TABLE_MAXNAMELEN];
-        /* Kernel fills these in. */
-        /* Which hook entry points are valid: bitmask */
-        unsigned int valid_hooks;
-        /* Hook entry points: one per netfilter hook. */
-        unsigned int hook_entry[NF_ARP_NUMHOOKS];
-        /* Underflow points. */
-        unsigned int underflow[NF_ARP_NUMHOOKS];
-        /* Number of entries */
-        unsigned int num_entries;
-        /* Size of entries. */
-        unsigned int size;
-};
-/* The argument to ARPT_SO_SET_REPLACE. */
-struct arpt_replace {
-        /* Which table. */
-        char name[XT_TABLE_MAXNAMELEN];
-        /* Which hook entry points are valid: bitmask.  You can't
-           change this. */
-        unsigned int valid_hooks;
-        /* Number of entries */
-        unsigned int num_entries;
author	David Howells <dhowells@redhat.com>	2012-10-09 04:48:56 -0400
committer	David Howells <dhowells@redhat.com>	2012-10-09 04:48:56 -0400
commit	8922082ae6cd2783789e83ae9c67ffcbe5a2f4e1 (patch)
tree	7b2b6598a0ddc7dbe6ebcc89f900366e5a748541
parent	a82014149becc68695e7f1d62a8cc1e4ae062318 (diff)

diff --git a/include/linux/netfilter_arp/Kbuild b/include/linux/netfilter_arp/Kbuild index b27439c71037..e69de29bb2d1 100644 --- a/include/linux/netfilter_arp/Kbuild +++ b/include/linux/netfilter_arp/Kbuild
@@ -1,2 +0,0 @@
1	header-y += arp_tables.h
2	header-y += arpt_mangle.h


diff --git a/include/linux/netfilter_arp/arp_tables.h b/include/linux/netfilter_arp/arp_tables.h index e08565d45178..cfb7191e6efa 100644 --- a/include/linux/netfilter_arp/arp_tables.h +++ b/include/linux/netfilter_arp/arp_tables.h
@@ -5,211 +5,14 @@
5	* network byte order.	5	* network byte order.
6	* flags are stored in host byte order (of course).	6	* flags are stored in host byte order (of course).
7	*/	7	*/
8
9	#ifndef _ARPTABLES_H	8	#ifndef _ARPTABLES_H
10	#define _ARPTABLES_H	9	#define _ARPTABLES_H
11		10
12	#ifdef __KERNEL__
13	#include <linux/if.h>	11	#include <linux/if.h>
14	#include <linux/in.h>	12	#include <linux/in.h>
15	#include <linux/if_arp.h>	13	#include <linux/if_arp.h>
16	#include <linux/skbuff.h>	14	#include <linux/skbuff.h>
17	#endif	15	#include <uapi/linux/netfilter_arp/arp_tables.h>
18	#include <linux/types.h>
19	#include <linux/compiler.h>
20	#include <linux/netfilter_arp.h>
21
22	#include <linux/netfilter/x_tables.h>
23
24	#ifndef __KERNEL__
25	#define ARPT_FUNCTION_MAXNAMELEN XT_FUNCTION_MAXNAMELEN
26	#define ARPT_TABLE_MAXNAMELEN XT_TABLE_MAXNAMELEN
27	#define arpt_entry_target xt_entry_target
28	#define arpt_standard_target xt_standard_target
29	#define arpt_error_target xt_error_target
30	#define ARPT_CONTINUE XT_CONTINUE
31	#define ARPT_RETURN XT_RETURN
32	#define arpt_counters_info xt_counters_info
33	#define arpt_counters xt_counters
34	#define ARPT_STANDARD_TARGET XT_STANDARD_TARGET
35	#define ARPT_ERROR_TARGET XT_ERROR_TARGET
36	#define ARPT_ENTRY_ITERATE(entries, size, fn, args...) \
37	XT_ENTRY_ITERATE(struct arpt_entry, entries, size, fn, ## args)
38	#endif
39
40	#define ARPT_DEV_ADDR_LEN_MAX 16
41
42	struct arpt_devaddr_info {
43	char addr[ARPT_DEV_ADDR_LEN_MAX];
44	char mask[ARPT_DEV_ADDR_LEN_MAX];
45	};
46
47	/* Yes, Virginia, you have to zero the padding. */
48	struct arpt_arp {
49	/* Source and target IP addr */
50	struct in_addr src, tgt;
51	/* Mask for src and target IP addr */
52	struct in_addr smsk, tmsk;
53
54	/* Device hw address length, src+target device addresses */
55	__u8 arhln, arhln_mask;
56	struct arpt_devaddr_info src_devaddr;
57	struct arpt_devaddr_info tgt_devaddr;
58
59	/* ARP operation code. */
60	__be16 arpop, arpop_mask;
61
62	/* ARP hardware address and protocol address format. */
63	__be16 arhrd, arhrd_mask;
64	__be16 arpro, arpro_mask;
65
66	/* The protocol address length is only accepted if it is 4
67	* so there is no use in offering a way to do filtering on it.
68	*/
69
70	char iniface[IFNAMSIZ], outiface[IFNAMSIZ];
71	unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
72
73	/* Flags word */
74	__u8 flags;
75	/* Inverse flags */
76	__u16 invflags;
77	};
78
79	/* Values for "flag" field in struct arpt_ip (general arp structure).
80	* No flags defined yet.
81	*/
82	#define ARPT_F_MASK 0x00 /* All possible flag bits mask. */
83
84	/* Values for "inv" field in struct arpt_arp. */
85	#define ARPT_INV_VIA_IN 0x0001 /* Invert the sense of IN IFACE. */
86	#define ARPT_INV_VIA_OUT 0x0002 /* Invert the sense of OUT IFACE */
87	#define ARPT_INV_SRCIP 0x0004 /* Invert the sense of SRC IP. */
88	#define ARPT_INV_TGTIP 0x0008 /* Invert the sense of TGT IP. */
89	#define ARPT_INV_SRCDEVADDR 0x0010 /* Invert the sense of SRC DEV ADDR. */
90	#define ARPT_INV_TGTDEVADDR 0x0020 /* Invert the sense of TGT DEV ADDR. */
91	#define ARPT_INV_ARPOP 0x0040 /* Invert the sense of ARP OP. */
92	#define ARPT_INV_ARPHRD 0x0080 /* Invert the sense of ARP HRD. */
93	#define ARPT_INV_ARPPRO 0x0100 /* Invert the sense of ARP PRO. */
94	#define ARPT_INV_ARPHLN 0x0200 /* Invert the sense of ARP HLN. */
95	#define ARPT_INV_MASK 0x03FF /* All possible flag bits mask. */
96
97	/* This structure defines each of the firewall rules. Consists of 3
98	parts which are 1) general ARP header stuff 2) match specific
99	stuff 3) the target to perform if the rule matches */
100	struct arpt_entry
101	{
102	struct arpt_arp arp;
103
104	/* Size of arpt_entry + matches */
105	__u16 target_offset;
106	/* Size of arpt_entry + matches + target */
107	__u16 next_offset;
108
109	/* Back pointer */
110	unsigned int comefrom;
111
112	/* Packet and byte counters. */
113	struct xt_counters counters;
114
115	/* The matches (if any), then the target. */
116	unsigned char elems[0];
117	};
118
119	/*
120	* New IP firewall options for [gs]etsockopt at the RAW IP level.
121	* Unlike BSD Linux inherits IP options so you don't have to use a raw
122	* socket for this. Instead we check rights in the calls.
123	*
124	* ATTENTION: check linux/in.h before adding new number here.
125	*/
126	#define ARPT_BASE_CTL 96
127
128	#define ARPT_SO_SET_REPLACE (ARPT_BASE_CTL)
129	#define ARPT_SO_SET_ADD_COUNTERS (ARPT_BASE_CTL + 1)
130	#define ARPT_SO_SET_MAX ARPT_SO_SET_ADD_COUNTERS
131
132	#define ARPT_SO_GET_INFO (ARPT_BASE_CTL)
133	#define ARPT_SO_GET_ENTRIES (ARPT_BASE_CTL + 1)
134	/* #define ARPT_SO_GET_REVISION_MATCH (APRT_BASE_CTL + 2) */
135	#define ARPT_SO_GET_REVISION_TARGET (ARPT_BASE_CTL + 3)
136	#define ARPT_SO_GET_MAX (ARPT_SO_GET_REVISION_TARGET)
137
138	/* The argument to ARPT_SO_GET_INFO */
139	struct arpt_getinfo {
140	/* Which table: caller fills this in. */
141	char name[XT_TABLE_MAXNAMELEN];
142
143	/* Kernel fills these in. */
144	/* Which hook entry points are valid: bitmask */
145	unsigned int valid_hooks;
146
147	/* Hook entry points: one per netfilter hook. */
148	unsigned int hook_entry[NF_ARP_NUMHOOKS];
149
150	/* Underflow points. */
151	unsigned int underflow[NF_ARP_NUMHOOKS];
152
153	/* Number of entries */
154	unsigned int num_entries;
155
156	/* Size of entries. */
157	unsigned int size;
158	};
159
160	/* The argument to ARPT_SO_SET_REPLACE. */
161	struct arpt_replace {
162	/* Which table. */
163	char name[XT_TABLE_MAXNAMELEN];
164
165	/* Which hook entry points are valid: bitmask. You can't
166	change this. */
167	unsigned int valid_hooks;
168
169	/* Number of entries */
170	unsigned int num_entries;