lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: xtables: use guarded types

Browse Source 
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>
This commit is contained in:
Jan Engelhardt
2010-12-15 22:58:53 +01:00
committed by Patrick McHardy
parent b880c1f077
commit f1c722295e
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/netfilter/xt_CT.h
View File

@@ -4,11 +4,11 @@
#define XT_CT_NOTRACK 0x1 #define XT_CT_NOTRACK 0x1
struct xt_ct_target_info { struct xt_ct_target_info {
u_int16_t flags; __u16 flags;
u_int16_t zone; __u16 zone;
u_int32_t ct_events; __u32 ct_events;
u_int32_t exp_events; __u32 exp_events;
char helper[16]; char helper[16];
/* Used internally by the kernel */ /* Used internally by the kernel */
struct nf_conn *ct __attribute__((aligned(8))); struct nf_conn *ct __attribute__((aligned(8)));

2
include/linux/netfilter/xt_TCPOPTSTRIP.h
View File

@@ -7,7 +7,7 @@
(((1U << (idx & 31)) & bmap[(idx) >> 5]) != 0) (((1U << (idx & 31)) & bmap[(idx) >> 5]) != 0)
struct xt_tcpoptstrip_target_info { struct xt_tcpoptstrip_target_info {
u_int32_t strip_bmap[8]; __u32 strip_bmap[8];
}; };
#endif /* _XT_TCPOPTSTRIP_H */ #endif /* _XT_TCPOPTSTRIP_H */

8
include/linux/netfilter/xt_TPROXY.h
View File

@@ -5,15 +5,15 @@
* redirection. We can get rid of that whenever we get support for * redirection. We can get rid of that whenever we get support for
* mutliple targets in the same rule. */ * mutliple targets in the same rule. */
struct xt_tproxy_target_info { struct xt_tproxy_target_info {
u_int32_t mark_mask; __u32 mark_mask;
u_int32_t mark_value; __u32 mark_value;
__be32 laddr; __be32 laddr;
__be16 lport; __be16 lport;
}; };
struct xt_tproxy_target_info_v1 { struct xt_tproxy_target_info_v1 {
u_int32_t mark_mask; __u32 mark_mask;
u_int32_t mark_value; __u32 mark_value;
union nf_inet_addr laddr; union nf_inet_addr laddr;
__be16 lport; __be16 lport;
}; };

8
include/linux/netfilter/xt_cluster.h
View File

@@ -6,10 +6,10 @@ enum xt_cluster_flags {
}; };
struct xt_cluster_match_info { struct xt_cluster_match_info {
u_int32_t total_nodes; __u32 total_nodes;
u_int32_t node_mask; __u32 node_mask;
u_int32_t hash_seed; __u32 hash_seed;
u_int32_t flags; __u32 flags;
}; };
#define XT_CLUSTER_NODES_MAX 32 #define XT_CLUSTER_NODES_MAX 32

6
include/linux/netfilter/xt_quota.h
View File

@@ -9,9 +9,9 @@ enum xt_quota_flags {
struct xt_quota_priv; struct xt_quota_priv;
struct xt_quota_info { struct xt_quota_info {
u_int32_t flags; __u32 flags;
u_int32_t pad; __u32 pad;
aligned_u64 quota; aligned_u64 quota;
/* Used internally by the kernel */ /* Used internally by the kernel */
struct xt_quota_priv *master; struct xt_quota_priv *master;

14
include/linux/netfilter/xt_time.h
View File

@@ -2,13 +2,13 @@
#define _XT_TIME_H 1 #define _XT_TIME_H 1
struct xt_time_info { struct xt_time_info {
u_int32_t date_start; __u32 date_start;
u_int32_t date_stop; __u32 date_stop;
u_int32_t daytime_start; __u32 daytime_start;
u_int32_t daytime_stop; __u32 daytime_stop;
u_int32_t monthdays_match; __u32 monthdays_match;
u_int8_t weekdays_match; __u8 weekdays_match;
u_int8_t flags; __u8 flags;
}; };
enum { enum {

16
include/linux/netfilter/xt_u32.h
View File

@@ -9,13 +9,13 @@ enum xt_u32_ops {
}; };
struct xt_u32_location_element { struct xt_u32_location_element {
u_int32_t number; __u32 number;
u_int8_t nextop; __u8 nextop;
}; };
struct xt_u32_value_element { struct xt_u32_value_element {
u_int32_t min; __u32 min;
u_int32_t max; __u32 max;
}; };
/* /*
@@ -27,14 +27,14 @@ struct xt_u32_value_element {
struct xt_u32_test { struct xt_u32_test {
struct xt_u32_location_element location[XT_U32_MAXSIZE+1]; struct xt_u32_location_element location[XT_U32_MAXSIZE+1];
struct xt_u32_value_element value[XT_U32_MAXSIZE+1]; struct xt_u32_value_element value[XT_U32_MAXSIZE+1];
u_int8_t nnums; __u8 nnums;
u_int8_t nvalues; __u8 nvalues;
}; };
struct xt_u32 { struct xt_u32 {
struct xt_u32_test tests[XT_U32_MAXSIZE+1]; struct xt_u32_test tests[XT_U32_MAXSIZE+1];
u_int8_t ntests; __u8 ntests;
u_int8_t invert; __u8 invert;
}; };
#endif /* _XT_U32_H */ #endif /* _XT_U32_H */