aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2010-12-15 16:58:53 -0500
committerPatrick McHardy <kaber@trash.net>2010-12-15 16:58:53 -0500
commitf1c722295e029eace7960fc687efd5afd67dc555 (patch)
tree84b24d3dbecde3947520999a2ed297891eae4d5c
parentb880c1f077000956b9f475d5f3b6c5e45ff2e342 (diff)
netfilter: xtables: use guarded types
We are supposed to use the kernel's own types in userspace exports. Signed-off-by: Jan Engelhardt <jengelh@medozas.de> Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r--include/linux/netfilter/xt_CT.h10
-rw-r--r--include/linux/netfilter/xt_TCPOPTSTRIP.h2
-rw-r--r--include/linux/netfilter/xt_TPROXY.h8
-rw-r--r--include/linux/netfilter/xt_cluster.h8
-rw-r--r--include/linux/netfilter/xt_quota.h6
-rw-r--r--include/linux/netfilter/xt_time.h14
-rw-r--r--include/linux/netfilter/xt_u32.h16
7 files changed, 32 insertions, 32 deletions
diff --git a/include/linux/netfilter/xt_CT.h b/include/linux/netfilter/xt_CT.h
index 1b564106891d..fbf4c5658554 100644
--- a/include/linux/netfilter/xt_CT.h
+++ b/include/linux/netfilter/xt_CT.h
@@ -4,11 +4,11 @@
4#define XT_CT_NOTRACK 0x1 4#define XT_CT_NOTRACK 0x1
5 5
6struct xt_ct_target_info { 6struct xt_ct_target_info {
7 u_int16_t flags; 7 __u16 flags;
8 u_int16_t zone; 8 __u16 zone;
9 u_int32_t ct_events; 9 __u32 ct_events;
10 u_int32_t exp_events; 10 __u32 exp_events;
11 char helper[16]; 11 char helper[16];
12 12
13 /* Used internally by the kernel */ 13 /* Used internally by the kernel */
14 struct nf_conn *ct __attribute__((aligned(8))); 14 struct nf_conn *ct __attribute__((aligned(8)));
diff --git a/include/linux/netfilter/xt_TCPOPTSTRIP.h b/include/linux/netfilter/xt_TCPOPTSTRIP.h
index 2db543214ff5..342ef14b1761 100644
--- a/include/linux/netfilter/xt_TCPOPTSTRIP.h
+++ b/include/linux/netfilter/xt_TCPOPTSTRIP.h
@@ -7,7 +7,7 @@
7 (((1U << (idx & 31)) & bmap[(idx) >> 5]) != 0) 7 (((1U << (idx & 31)) & bmap[(idx) >> 5]) != 0)
8 8
9struct xt_tcpoptstrip_target_info { 9struct xt_tcpoptstrip_target_info {
10 u_int32_t strip_bmap[8]; 10 __u32 strip_bmap[8];
11}; 11};
12 12
13#endif /* _XT_TCPOPTSTRIP_H */ 13#endif /* _XT_TCPOPTSTRIP_H */
diff --git a/include/linux/netfilter/xt_TPROXY.h b/include/linux/netfilter/xt_TPROXY.h
index 3f3d69361289..8097e0b4c15e 100644
--- a/include/linux/netfilter/xt_TPROXY.h
+++ b/include/linux/netfilter/xt_TPROXY.h
@@ -5,15 +5,15 @@
5 * redirection. We can get rid of that whenever we get support for 5 * redirection. We can get rid of that whenever we get support for
6 * mutliple targets in the same rule. */ 6 * mutliple targets in the same rule. */
7struct xt_tproxy_target_info { 7struct xt_tproxy_target_info {
8 u_int32_t mark_mask; 8 __u32 mark_mask;
9 u_int32_t mark_value; 9 __u32 mark_value;
10 __be32 laddr; 10 __be32 laddr;
11 __be16 lport; 11 __be16 lport;
12}; 12};
13 13
14struct xt_tproxy_target_info_v1 { 14struct xt_tproxy_target_info_v1 {
15 u_int32_t mark_mask; 15 __u32 mark_mask;
16 u_int32_t mark_value; 16 __u32 mark_value;
17 union nf_inet_addr laddr; 17 union nf_inet_addr laddr;
18 __be16 lport; 18 __be16 lport;
19}; 19};
diff --git a/include/linux/netfilter/xt_cluster.h b/include/linux/netfilter/xt_cluster.h
index 886682656f09..66cfa3c782ac 100644
--- a/include/linux/netfilter/xt_cluster.h
+++ b/include/linux/netfilter/xt_cluster.h
@@ -6,10 +6,10 @@ enum xt_cluster_flags {
6}; 6};
7 7
8struct xt_cluster_match_info { 8struct xt_cluster_match_info {
9 u_int32_t total_nodes; 9 __u32 total_nodes;
10 u_int32_t node_mask; 10 __u32 node_mask;
11 u_int32_t hash_seed; 11 __u32 hash_seed;
12 u_int32_t flags; 12 __u32 flags;
13}; 13};
14 14
15#define XT_CLUSTER_NODES_MAX 32 15#define XT_CLUSTER_NODES_MAX 32
diff --git a/include/linux/netfilter/xt_quota.h b/include/linux/netfilter/xt_quota.h
index b0d28c659ab7..8bda65f0bc92 100644
--- a/include/linux/netfilter/xt_quota.h
+++ b/include/linux/netfilter/xt_quota.h
@@ -9,9 +9,9 @@ enum xt_quota_flags {
9struct xt_quota_priv; 9struct xt_quota_priv;
10 10
11struct xt_quota_info { 11struct xt_quota_info {
12 u_int32_t flags; 12 __u32 flags;
13 u_int32_t pad; 13 __u32 pad;
14 aligned_u64 quota; 14 aligned_u64 quota;
15 15
16 /* Used internally by the kernel */ 16 /* Used internally by the kernel */
17 struct xt_quota_priv *master; 17 struct xt_quota_priv *master;
diff --git a/include/linux/netfilter/xt_time.h b/include/linux/netfilter/xt_time.h
index 14b6df412c9f..b8bd4568efdb 100644
--- a/include/linux/netfilter/xt_time.h
+++ b/include/linux/netfilter/xt_time.h
@@ -2,13 +2,13 @@
2#define _XT_TIME_H 1 2#define _XT_TIME_H 1
3 3
4struct xt_time_info { 4struct xt_time_info {
5 u_int32_t date_start; 5 __u32 date_start;
6 u_int32_t date_stop; 6 __u32 date_stop;
7 u_int32_t daytime_start; 7 __u32 daytime_start;
8 u_int32_t daytime_stop; 8 __u32 daytime_stop;
9 u_int32_t monthdays_match; 9 __u32 monthdays_match;
10 u_int8_t weekdays_match; 10 __u8 weekdays_match;
11 u_int8_t flags; 11 __u8 flags;
12}; 12};
13 13
14enum { 14enum {
diff --git a/include/linux/netfilter/xt_u32.h b/include/linux/netfilter/xt_u32.h
index 9947f56cdbdd..e8c3d8722bae 100644
--- a/include/linux/netfilter/xt_u32.h
+++ b/include/linux/netfilter/xt_u32.h
@@ -9,13 +9,13 @@ enum xt_u32_ops {
9}; 9};
10 10
11struct xt_u32_location_element { 11struct xt_u32_location_element {
12 u_int32_t number; 12 __u32 number;
13 u_int8_t nextop; 13 __u8 nextop;
14}; 14};
15 15
16struct xt_u32_value_element { 16struct xt_u32_value_element {
17 u_int32_t min; 17 __u32 min;
18 u_int32_t max; 18 __u32 max;
19}; 19};
20 20
21/* 21/*
@@ -27,14 +27,14 @@ struct xt_u32_value_element {
27struct xt_u32_test { 27struct xt_u32_test {
28 struct xt_u32_location_element location[XT_U32_MAXSIZE+1]; 28 struct xt_u32_location_element location[XT_U32_MAXSIZE+1];
29 struct xt_u32_value_element value[XT_U32_MAXSIZE+1]; 29 struct xt_u32_value_element value[XT_U32_MAXSIZE+1];
30 u_int8_t nnums; 30 __u8 nnums;
31 u_int8_t nvalues; 31 __u8 nvalues;
32}; 32};
33 33
34struct xt_u32 { 34struct xt_u32 {
35 struct xt_u32_test tests[XT_U32_MAXSIZE+1]; 35 struct xt_u32_test tests[XT_U32_MAXSIZE+1];
36 u_int8_t ntests; 36 __u8 ntests;
37 u_int8_t invert; 37 __u8 invert;
38}; 38};
39 39
40#endif /* _XT_U32_H */ 40#endif /* _XT_U32_H */