netfilter: Use unsigned types for hooknum and pf vars (76108cea) · Commits · jan.koester / Linux

include/linux/netfilter.h

+16 −14

Original line number	Original line	Diff line number	Diff line
	@@ -92,8 +92,8 @@ struct nf_hook_ops
	/* User fills in from here down. */		/* User fills in from here down. */
	nf_hookfn *hook;		nf_hookfn *hook;
	struct module *owner;		struct module *owner;
	int pf;		u_int8_t pf;
	int hooknum;		unsigned int hooknum;
	/* Hooks are ordered in ascending priority. */		/* Hooks are ordered in ascending priority. */
	int priority;		int priority;
	};		};
	@@ -102,7 +102,7 @@ struct nf_sockopt_ops
	{		{
	struct list_head list;		struct list_head list;

	int pf;		u_int8_t pf;

	/* Non-inclusive ranges: use 0/0/NULL to never get called. */		/* Non-inclusive ranges: use 0/0/NULL to never get called. */
	int set_optmin;		int set_optmin;
	@@ -140,7 +140,7 @@ extern struct ctl_path nf_net_ipv4_netfilter_sysctl_path[];

	extern struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS];		extern struct list_head nf_hooks[NPROTO][NF_MAX_HOOKS];

	int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb,		int nf_hook_slow(u_int8_t pf, unsigned int hook, struct sk_buff *skb,
	struct net_device indev, struct net_device outdev,		struct net_device indev, struct net_device outdev,
	int (okfn)(struct sk_buff ), int thresh);		int (okfn)(struct sk_buff ), int thresh);

	@@ -151,7 +151,7 @@ int nf_hook_slow(int pf, unsigned int hook, struct sk_buff *skb,
	* okfn must be invoked by the caller in this case. Any other return		* okfn must be invoked by the caller in this case. Any other return
	* value indicates the packet has been consumed by the hook.		* value indicates the packet has been consumed by the hook.
	*/		*/
	static inline int nf_hook_thresh(int pf, unsigned int hook,		static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook,
	struct sk_buff *skb,		struct sk_buff *skb,
	struct net_device *indev,		struct net_device *indev,
	struct net_device *outdev,		struct net_device *outdev,
	@@ -167,7 +167,7 @@ static inline int nf_hook_thresh(int pf, unsigned int hook,
	return nf_hook_slow(pf, hook, skb, indev, outdev, okfn, thresh);		return nf_hook_slow(pf, hook, skb, indev, outdev, okfn, thresh);
	}		}

	static inline int nf_hook(int pf, unsigned int hook, struct sk_buff *skb,		static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sk_buff *skb,
	struct net_device indev, struct net_device outdev,		struct net_device indev, struct net_device outdev,
	int (okfn)(struct sk_buff ))		int (okfn)(struct sk_buff ))
	{		{
	@@ -212,14 +212,14 @@ __ret;})
	NF_HOOK_THRESH(pf, hook, skb, indev, outdev, okfn, INT_MIN)		NF_HOOK_THRESH(pf, hook, skb, indev, outdev, okfn, INT_MIN)

	/* Call setsockopt() */		/* Call setsockopt() */
	int nf_setsockopt(struct sock sk, int pf, int optval, char __user opt,		int nf_setsockopt(struct sock sk, u_int8_t pf, int optval, char __user opt,
	int len);		int len);
	int nf_getsockopt(struct sock sk, int pf, int optval, char __user opt,		int nf_getsockopt(struct sock sk, u_int8_t pf, int optval, char __user opt,
	int *len);		int *len);

	int compat_nf_setsockopt(struct sock *sk, int pf, int optval,		int compat_nf_setsockopt(struct sock *sk, u_int8_t pf, int optval,
	char __user *opt, int len);		char __user *opt, int len);
	int compat_nf_getsockopt(struct sock *sk, int pf, int optval,		int compat_nf_getsockopt(struct sock *sk, u_int8_t pf, int optval,
	char __user opt, int len);		char __user opt, int len);

	/* Call this before modifying an existing packet: ensures it is		/* Call this before modifying an existing packet: ensures it is
	@@ -292,7 +292,7 @@ extern void nf_unregister_afinfo(const struct nf_afinfo *afinfo);
	extern void (ip_nat_decode_session)(struct sk_buff , struct flowi *);		extern void (ip_nat_decode_session)(struct sk_buff , struct flowi *);

	static inline void		static inline void
	nf_nat_decode_session(struct sk_buff skb, struct flowi fl, int family)		nf_nat_decode_session(struct sk_buff skb, struct flowi fl, u_int8_t family)
	{		{
	#ifdef CONFIG_NF_NAT_NEEDED		#ifdef CONFIG_NF_NAT_NEEDED
	void (decodefn)(struct sk_buff , struct flowi *);		void (decodefn)(struct sk_buff , struct flowi *);
	@@ -315,7 +315,7 @@ extern struct proc_dir_entry *proc_net_netfilter;
	#else /* !CONFIG_NETFILTER */		#else /* !CONFIG_NETFILTER */
	#define NF_HOOK(pf, hook, skb, indev, outdev, okfn) (okfn)(skb)		#define NF_HOOK(pf, hook, skb, indev, outdev, okfn) (okfn)(skb)
	#define NF_HOOK_COND(pf, hook, skb, indev, outdev, okfn, cond) (okfn)(skb)		#define NF_HOOK_COND(pf, hook, skb, indev, outdev, okfn, cond) (okfn)(skb)
	static inline int nf_hook_thresh(int pf, unsigned int hook,		static inline int nf_hook_thresh(u_int8_t pf, unsigned int hook,
	struct sk_buff *skb,		struct sk_buff *skb,
	struct net_device *indev,		struct net_device *indev,
	struct net_device *outdev,		struct net_device *outdev,
	@@ -324,7 +324,7 @@ static inline int nf_hook_thresh(int pf, unsigned int hook,
	{		{
	return okfn(skb);		return okfn(skb);
	}		}
	static inline int nf_hook(int pf, unsigned int hook, struct sk_buff *skb,		static inline int nf_hook(u_int8_t pf, unsigned int hook, struct sk_buff *skb,
	struct net_device indev, struct net_device outdev,		struct net_device indev, struct net_device outdev,
	int (okfn)(struct sk_buff ))		int (okfn)(struct sk_buff ))
	{		{
	@@ -332,7 +332,9 @@ static inline int nf_hook(int pf, unsigned int hook, struct sk_buff *skb,
	}		}
	struct flowi;		struct flowi;
	static inline void		static inline void
	nf_nat_decode_session(struct sk_buff skb, struct flowi fl, int family) {}		nf_nat_decode_session(struct sk_buff skb, struct flowi fl, u_int8_t family)
			{
			}
	#endif /CONFIG_NETFILTER/		#endif /CONFIG_NETFILTER/

	#if defined(CONFIG_NF_CONNTRACK) \|\| defined(CONFIG_NF_CONNTRACK_MODULE)		#if defined(CONFIG_NF_CONNTRACK) \|\| defined(CONFIG_NF_CONNTRACK_MODULE)

include/linux/netfilter/x_tables.h

+14 −14

Original line number	Original line	Diff line number	Diff line
	@@ -292,7 +292,7 @@ struct xt_table
	/* Set this to THIS_MODULE if you are a module, otherwise NULL */		/* Set this to THIS_MODULE if you are a module, otherwise NULL */
	struct module *me;		struct module *me;

	int af; /* address/protocol family */		u_int8_t af; /* address/protocol family */
	};		};

	#include <linux/netfilter_ipv4.h>		#include <linux/netfilter_ipv4.h>
	@@ -346,19 +346,19 @@ extern struct xt_table_info xt_replace_table(struct xt_table table,
	struct xt_table_info *newinfo,		struct xt_table_info *newinfo,
	int *error);		int *error);

	extern struct xt_match xt_find_match(int af, const char name, u8 revision);		extern struct xt_match xt_find_match(u8 af, const char name, u8 revision);
	extern struct xt_target xt_find_target(int af, const char name, u8 revision);		extern struct xt_target xt_find_target(u8 af, const char name, u8 revision);
	extern struct xt_target xt_request_find_target(int af, const char name,		extern struct xt_target xt_request_find_target(u8 af, const char name,
	u8 revision);		u8 revision);
	extern int xt_find_revision(int af, const char *name, u8 revision, int target,		extern int xt_find_revision(u8 af, const char *name, u8 revision,
	int *err);		int target, int *err);

	extern struct xt_table xt_find_table_lock(struct net net, int af,		extern struct xt_table xt_find_table_lock(struct net net, u_int8_t af,
	const char *name);		const char *name);
	extern void xt_table_unlock(struct xt_table *t);		extern void xt_table_unlock(struct xt_table *t);

	extern int xt_proto_init(struct net *net, int af);		extern int xt_proto_init(struct net *net, u_int8_t af);
	extern void xt_proto_fini(struct net *net, int af);		extern void xt_proto_fini(struct net *net, u_int8_t af);

	extern struct xt_table_info *xt_alloc_table_info(unsigned int size);		extern struct xt_table_info *xt_alloc_table_info(unsigned int size);
	extern void xt_free_table_info(struct xt_table_info *info);		extern void xt_free_table_info(struct xt_table_info *info);
	@@ -423,12 +423,12 @@ struct compat_xt_counters_info
	#define COMPAT_XT_ALIGN(s) (((s) + (__alignof__(struct compat_xt_counters)-1)) \		#define COMPAT_XT_ALIGN(s) (((s) + (__alignof__(struct compat_xt_counters)-1)) \
	& ~(__alignof__(struct compat_xt_counters)-1))		& ~(__alignof__(struct compat_xt_counters)-1))

	extern void xt_compat_lock(int af);		extern void xt_compat_lock(u_int8_t af);
	extern void xt_compat_unlock(int af);		extern void xt_compat_unlock(u_int8_t af);

	extern int xt_compat_add_offset(int af, unsigned int offset, short delta);		extern int xt_compat_add_offset(u_int8_t af, unsigned int offset, short delta);
	extern void xt_compat_flush_offsets(int af);		extern void xt_compat_flush_offsets(u_int8_t af);
	extern short xt_compat_calc_jump(int af, unsigned int offset);		extern short xt_compat_calc_jump(u_int8_t af, unsigned int offset);

	extern int xt_compat_match_offset(const struct xt_match *match);		extern int xt_compat_match_offset(const struct xt_match *match);
	extern int xt_compat_match_from_user(struct xt_entry_match *m,		extern int xt_compat_match_from_user(struct xt_entry_match *m,

include/net/netfilter/nf_conntrack_core.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,7 @@
	/* This header is used to share core functionality between the		/* This header is used to share core functionality between the
	standalone connection tracking module, and the compatibility layer's use		standalone connection tracking module, and the compatibility layer's use
	of connection tracking. */		of connection tracking. */
	extern unsigned int nf_conntrack_in(int pf,		extern unsigned int nf_conntrack_in(u_int8_t pf,
	unsigned int hooknum,		unsigned int hooknum,
	struct sk_buff *skb);		struct sk_buff *skb);

include/net/netfilter/nf_conntrack_expect.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -86,7 +86,7 @@ void nf_ct_unexpect_related(struct nf_conntrack_expect *exp);
	/* Allocate space for an expectation: this is mandatory before calling		/* Allocate space for an expectation: this is mandatory before calling
	nf_ct_expect_related. You will have to call put afterwards. */		nf_ct_expect_related. You will have to call put afterwards. */
	struct nf_conntrack_expect nf_ct_expect_alloc(struct nf_conn me);		struct nf_conntrack_expect nf_ct_expect_alloc(struct nf_conn me);
	void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, int,		void nf_ct_expect_init(struct nf_conntrack_expect *, unsigned int, u_int8_t,
	const union nf_inet_addr *,		const union nf_inet_addr *,
	const union nf_inet_addr *,		const union nf_inet_addr *,
	u_int8_t, const __be16 , const __be16 );		u_int8_t, const __be16 , const __be16 );

include/net/netfilter/nf_conntrack_l4proto.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@ struct nf_conntrack_l4proto
	const struct sk_buff *skb,		const struct sk_buff *skb,
	unsigned int dataoff,		unsigned int dataoff,
	enum ip_conntrack_info ctinfo,		enum ip_conntrack_info ctinfo,
	int pf,		u_int8_t pf,
	unsigned int hooknum);		unsigned int hooknum);

	/* Called when a new connection for this protocol found;		/* Called when a new connection for this protocol found;
	@@ -52,7 +52,7 @@ struct nf_conntrack_l4proto

	int (error)(struct sk_buff skb, unsigned int dataoff,		int (error)(struct sk_buff skb, unsigned int dataoff,
	enum ip_conntrack_info *ctinfo,		enum ip_conntrack_info *ctinfo,
	int pf, unsigned int hooknum);		u_int8_t pf, unsigned int hooknum);

	/* Print out the per-protocol part of the tuple. Return like seq_* */		/* Print out the per-protocol part of the tuple. Return like seq_* */
	int (print_tuple)(struct seq_file s,		int (print_tuple)(struct seq_file s,