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

Commit 89c002d6 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: {ip,ip6,arp}_tables: consolidate iterator macros 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89566951

include/linux/netfilter/x_tables.h

+43 −0
Original line number Diff line number Diff line
@@ -126,6 +126,49 @@ struct xt_counters_info 


#define XT_INV_PROTO		0x40	/* Invert the sense of PROTO. */



/* fn returns 0 to continue iteration */

#define XT_MATCH_ITERATE(type, e, fn, args...)			\

({								\

	unsigned int __i;					\

	int __ret = 0;						\

	struct xt_entry_match *__m;				\

								\

	for (__i = sizeof(type);				\

	     __i < (e)->target_offset;				\

	     __i += __m->u.match_size) {			\

		__m = (void *)e + __i;				\

								\

		__ret = fn(__m , ## args);			\

		if (__ret != 0)					\

			break;					\

	}							\

	__ret;							\

})



/* fn returns 0 to continue iteration */

#define XT_ENTRY_ITERATE_CONTINUE(type, entries, size, n, fn, args...) \

({								\

	unsigned int __i, __n;					\

	int __ret = 0;						\

	type *__entry;						\

								\

	for (__i = 0, __n = 0; __i < (size);			\

	     __i += __entry->next_offset, __n++) { 		\

		__entry = (void *)(entries) + __i;		\

		if (__n < n)					\

			continue;				\

								\

		__ret = fn(__entry , ## args);			\

		if (__ret != 0)					\

			break;					\

	}							\

	__ret;							\

})



/* fn returns 0 to continue iteration */

#define XT_ENTRY_ITERATE(type, entries, size, fn, args...) \

	XT_ENTRY_ITERATE_CONTINUE(type, entries, size, 0, fn, args)



#ifdef __KERNEL__



#include <linux/netdevice.h>

include/linux/netfilter_arp/arp_tables.h

+2 −15
Original line number Diff line number Diff line
@@ -218,20 +218,7 @@ static __inline__ struct arpt_entry_target *arpt_get_target(struct arpt_entry *e 


/* fn returns 0 to continue iteration */

#define ARPT_ENTRY_ITERATE(entries, size, fn, args...) \

({								\

	unsigned int __i;					\

	int __ret = 0;						\

	struct arpt_entry *__entry;				\

								\

	for (__i = 0; __i < (size); __i += __entry->next_offset) { \

		__entry = (void *)(entries) + __i;		\

								\

		__ret = fn(__entry , ## args);			\

		if (__ret != 0)					\

			break;					\

	}							\

	__ret;							\

})

	XT_ENTRY_ITERATE(struct arpt_entry, entries, size, fn, ## args)



/*

 *	Main firewall chains definitions and global var's definitions.

include/linux/netfilter_ipv4/ip_tables.h

+6 −49
Original line number Diff line number Diff line
@@ -230,59 +230,16 @@ ipt_get_target(struct ipt_entry *e) 


/* fn returns 0 to continue iteration */

#define IPT_MATCH_ITERATE(e, fn, args...) \

({						\

	unsigned int __i;			\

	int __ret = 0;				\

	struct ipt_entry_match *__match;	\

						\

	for (__i = sizeof(struct ipt_entry);	\

	     __i < (e)->target_offset;		\

	     __i += __match->u.match_size) {	\

		__match = (void *)(e) + __i;	\

						\

		__ret = fn(__match , ## args);	\

		if (__ret != 0)			\

			break;			\

	}					\

	__ret;					\

})

	XT_MATCH_ITERATE(struct ipt_entry, e, fn, ## args)



/* fn returns 0 to continue iteration */

#define IPT_ENTRY_ITERATE(entries, size, fn, args...) \

({								\

	unsigned int __i;					\

	int __ret = 0;						\

	struct ipt_entry *__entry;				\

								\

	for (__i = 0; __i < (size); __i += __entry->next_offset) { \

		__entry = (void *)(entries) + __i;		\

								\

		__ret = fn(__entry , ## args);			\

		if (__ret != 0)					\

			break;					\

	}							\

	__ret;							\

})

	XT_ENTRY_ITERATE(struct ipt_entry, entries, size, fn, ## args)



/* fn returns 0 to continue iteration */

#define IPT_ENTRY_ITERATE_CONTINUE(entries, size, n, fn, args...) \

({								\

	unsigned int __i, __n;					\

	int __ret = 0;						\

	struct ipt_entry *__entry;				\

								\

	for (__i = 0, __n = 0; __i < (size);			\

	     __i += __entry->next_offset, __n++) { 		\

		__entry = (void *)(entries) + __i;		\

		if (__n < n)					\

			continue;				\

								\

		__ret = fn(__entry , ## args);			\

		if (__ret != 0)					\

			break;					\

	}							\

	__ret;							\

})

	XT_ENTRY_ITERATE_CONTINUE(struct ipt_entry, entries, size, n, fn, \

				  ## args)



/*

 *	Main firewall chains definitions and global var's definitions.

include/linux/netfilter_ipv6/ip6_tables.h

+4 −32
Original line number Diff line number Diff line
@@ -290,39 +290,11 @@ ip6t_get_target(struct ip6t_entry *e) 


/* fn returns 0 to continue iteration */

#define IP6T_MATCH_ITERATE(e, fn, args...) \

({						\

	unsigned int __i;			\

	int __ret = 0;				\

	struct ip6t_entry_match *__m;		\

						\

	for (__i = sizeof(struct ip6t_entry);	\

	     __i < (e)->target_offset;		\

	     __i += __m->u.match_size) {	\

		__m = (void *)(e) + __i;	\

						\

		__ret = fn(__m , ## args);	\

		if (__ret != 0)			\

			break;			\

	}					\

	__ret;					\

})

	XT_MATCH_ITERATE(struct ip6t_entry, e, fn, ## args)



/* fn returns 0 to continue iteration */

#define IP6T_ENTRY_ITERATE(entries, size, fn, args...) \

({								\

	unsigned int __i;					\

	int __ret = 0;						\

	struct ip6t_entry *__e;					\

								\

	for (__i = 0; __i < (size); __i += __e->next_offset) {	\

		__e = (void *)(entries) + __i;			\

								\

		__ret = fn(__e , ## args);			\

		if (__ret != 0)					\

			break;					\

	}							\

	__ret;							\

})

	XT_ENTRY_ITERATE(struct ip6t_entry, entries, size, fn, ## args)



/*

 *	Main firewall chains definitions and global var's definitions.