Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1c72229 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

netfilter: xtables: use guarded types 



We are supposed to use the kernel's own types in userspace exports.

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent b880c1f0

include/linux/netfilter/xt_CT.h

+5 −5
Original line number Original line Diff line number Diff line
@@ -4,10 +4,10 @@ 
#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 */

include/linux/netfilter/xt_TCPOPTSTRIP.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 */

include/linux/netfilter/xt_TPROXY.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -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;

};

};

include/linux/netfilter/xt_cluster.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -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

include/linux/netfilter/xt_quota.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -9,8 +9,8 @@ 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 */