Commit f925f705 authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: Rename extension offset ids to extension ids 



Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent a04d8b6b

include/linux/netfilter/ipset/ip_set.h

+8 −8
Original line number Diff line number Diff line
@@ -56,20 +56,20 @@ enum ip_set_extension { 
	IPSET_EXT_COUNTER = (1 << IPSET_EXT_BIT_COUNTER),

};



/* Extension offsets */

enum ip_set_offset {

	IPSET_OFFSET_TIMEOUT = 0,

	IPSET_OFFSET_COUNTER,

	IPSET_OFFSET_MAX,

};



#define SET_WITH_TIMEOUT(s)	((s)->extensions & IPSET_EXT_TIMEOUT)

#define SET_WITH_COUNTER(s)	((s)->extensions & IPSET_EXT_COUNTER)



/* Extension id, in size order */

enum ip_set_ext_id {

	IPSET_EXT_ID_COUNTER = 0,

	IPSET_EXT_ID_TIMEOUT,

	IPSET_EXT_ID_MAX,

};



struct ip_set_ext {

	u32 timeout;

	u64 packets;

	u64 bytes;

	u32 timeout;

};



struct ip_set;

net/netfilter/ipset/ip_set_bitmap_gen.h

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ 
#define mtype			MTYPE



#define ext_timeout(e, m)	\

	(unsigned long *)((e) + (m)->offset[IPSET_OFFSET_TIMEOUT])

	(unsigned long *)((e) + (m)->offset[IPSET_EXT_ID_TIMEOUT])

#define ext_counter(e, m)	\

	(struct ip_set_counter *)((e) + (m)->offset[IPSET_OFFSET_COUNTER])

	(struct ip_set_counter *)((e) + (m)->offset[IPSET_EXT_ID_COUNTER])

#define get_ext(map, id)	((map)->extensions + (map)->dsize * (id))



static void

net/netfilter/ipset/ip_set_bitmap_ip.c

+5 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct bitmap_ip { 
	u32 hosts;		/* number of hosts in a subnet */

	size_t memsize;		/* members size */

	size_t dsize;		/* extensions struct size */

	size_t offset[IPSET_OFFSET_MAX]; /* Offsets to extensions */

	size_t offset[IPSET_EXT_ID_MAX]; /* Offsets to extensions */

	u8 netmask;		/* subnet netmask */

	u32 timeout;		/* timeout parameter */

	struct timer_list gc;	/* garbage collection */
@@ -342,9 +342,9 @@ bitmap_ip_create(struct ip_set *set, struct nlattr *tb[], u32 flags) 
		set->extensions |= IPSET_EXT_COUNTER;

		if (tb[IPSET_ATTR_TIMEOUT]) {

			map->dsize = sizeof(struct bitmap_ipct_elem);

			map->offset[IPSET_OFFSET_TIMEOUT] =

			map->offset[IPSET_EXT_ID_TIMEOUT] =

				offsetof(struct bitmap_ipct_elem, timeout);

			map->offset[IPSET_OFFSET_COUNTER] =

			map->offset[IPSET_EXT_ID_COUNTER] =

				offsetof(struct bitmap_ipct_elem, counter);



			if (!init_map_ip(set, map, first_ip, last_ip,
@@ -360,7 +360,7 @@ bitmap_ip_create(struct ip_set *set, struct nlattr *tb[], u32 flags) 
			bitmap_ip_gc_init(set, bitmap_ip_gc);

		} else {

			map->dsize = sizeof(struct bitmap_ipc_elem);

			map->offset[IPSET_OFFSET_COUNTER] =

			map->offset[IPSET_EXT_ID_COUNTER] =

				offsetof(struct bitmap_ipc_elem, counter);



			if (!init_map_ip(set, map, first_ip, last_ip,
@@ -371,7 +371,7 @@ bitmap_ip_create(struct ip_set *set, struct nlattr *tb[], u32 flags) 
		}

	} else if (tb[IPSET_ATTR_TIMEOUT]) {

		map->dsize = sizeof(struct bitmap_ipt_elem);

		map->offset[IPSET_OFFSET_TIMEOUT] =

		map->offset[IPSET_EXT_ID_TIMEOUT] =

			offsetof(struct bitmap_ipt_elem, timeout);



		if (!init_map_ip(set, map, first_ip, last_ip,

net/netfilter/ipset/ip_set_bitmap_ipmac.c

+5 −5
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct bitmap_ipmac { 
	struct timer_list gc;	/* garbage collector */

	size_t memsize;		/* members size */

	size_t dsize;		/* size of element */

	size_t offset[IPSET_OFFSET_MAX]; /* Offsets to extensions */

	size_t offset[IPSET_EXT_ID_MAX]; /* Offsets to extensions */

};



/* ADT structure for generic function args */
@@ -405,9 +405,9 @@ bitmap_ipmac_create(struct ip_set *set, struct nlattr *tb[], 
		set->extensions |= IPSET_EXT_COUNTER;

		if (tb[IPSET_ATTR_TIMEOUT]) {

			map->dsize = sizeof(struct bitmap_ipmacct_elem);

			map->offset[IPSET_OFFSET_TIMEOUT] =

			map->offset[IPSET_EXT_ID_TIMEOUT] =

				offsetof(struct bitmap_ipmacct_elem, timeout);

			map->offset[IPSET_OFFSET_COUNTER] =

			map->offset[IPSET_EXT_ID_COUNTER] =

				offsetof(struct bitmap_ipmacct_elem, counter);



			if (!init_map_ipmac(set, map, first_ip, last_ip,
@@ -421,7 +421,7 @@ bitmap_ipmac_create(struct ip_set *set, struct nlattr *tb[], 
			bitmap_ipmac_gc_init(set, bitmap_ipmac_gc);

		} else {

			map->dsize = sizeof(struct bitmap_ipmacc_elem);

			map->offset[IPSET_OFFSET_COUNTER] =

			map->offset[IPSET_EXT_ID_COUNTER] =

				offsetof(struct bitmap_ipmacc_elem, counter);



			if (!init_map_ipmac(set, map, first_ip, last_ip,
@@ -432,7 +432,7 @@ bitmap_ipmac_create(struct ip_set *set, struct nlattr *tb[], 
		}

	} else if (tb[IPSET_ATTR_TIMEOUT]) {

		map->dsize = sizeof(struct bitmap_ipmact_elem);

		map->offset[IPSET_OFFSET_TIMEOUT] =

		map->offset[IPSET_EXT_ID_TIMEOUT] =

			offsetof(struct bitmap_ipmact_elem, timeout);



		if (!init_map_ipmac(set, map, first_ip, last_ip, elements)) {

net/netfilter/ipset/ip_set_bitmap_port.c

+5 −5
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct bitmap_port { 
	u32 elements;		/* number of max elements in the set */

	size_t memsize;		/* members size */

	size_t dsize;		/* extensions struct size */

	size_t offset[IPSET_OFFSET_MAX]; /* Offsets to extensions */

	size_t offset[IPSET_EXT_ID_MAX]; /* Offsets to extensions */

	u32 timeout;		/* timeout parameter */

	struct timer_list gc;	/* garbage collection */

};
@@ -282,9 +282,9 @@ bitmap_port_create(struct ip_set *set, struct nlattr *tb[], u32 flags) 
		set->extensions |= IPSET_EXT_COUNTER;

		if (tb[IPSET_ATTR_TIMEOUT]) {

			map->dsize = sizeof(struct bitmap_portct_elem);

			map->offset[IPSET_OFFSET_TIMEOUT] =

			map->offset[IPSET_EXT_ID_TIMEOUT] =

				offsetof(struct bitmap_portct_elem, timeout);

			map->offset[IPSET_OFFSET_COUNTER] =

			map->offset[IPSET_EXT_ID_COUNTER] =

				offsetof(struct bitmap_portct_elem, counter);

			if (!init_map_port(set, map, first_port, last_port)) {

				kfree(map);
@@ -297,7 +297,7 @@ bitmap_port_create(struct ip_set *set, struct nlattr *tb[], u32 flags) 
			bitmap_port_gc_init(set, bitmap_port_gc);

		} else {

			map->dsize = sizeof(struct bitmap_portc_elem);

			map->offset[IPSET_OFFSET_COUNTER] =

			map->offset[IPSET_EXT_ID_COUNTER] =

				offsetof(struct bitmap_portc_elem, counter);

			if (!init_map_port(set, map, first_port, last_port)) {

				kfree(map);
@@ -306,7 +306,7 @@ bitmap_port_create(struct ip_set *set, struct nlattr *tb[], u32 flags) 
		}

	} else if (tb[IPSET_ATTR_TIMEOUT]) {

		map->dsize = sizeof(struct bitmap_portt_elem);

		map->offset[IPSET_OFFSET_TIMEOUT] =

		map->offset[IPSET_EXT_ID_TIMEOUT] =

			offsetof(struct bitmap_portt_elem, timeout);

		if (!init_map_port(set, map, first_port, last_port)) {

			kfree(map);