openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

netfilter: ipset: Rename extension offset ids to extension ids 

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
This commit is contained in:
Jozsef Kadlecsik 2013-09-06 22:31:40 +02:00
parent a04d8b6bd9
commit f925f70569
7 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/linux/netfilter/ipset/ip_set.h
View File

@ -56,20 +56,20 @@ enum ip_set_extension {
IPSET_EXT_COUNTER = (1 << IPSET_EXT_BIT_COUNTER), 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_TIMEOUT(s) ((s)->extensions & IPSET_EXT_TIMEOUT)
#define SET_WITH_COUNTER(s) ((s)->extensions & IPSET_EXT_COUNTER) #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 { struct ip_set_ext {
u32 timeout;
u64 packets; u64 packets;
u64 bytes; u64 bytes;
u32 timeout;
}; };
struct ip_set; struct ip_set;

4
net/netfilter/ipset/ip_set_bitmap_gen.h
View File

@ -33,9 +33,9 @@
#define mtype MTYPE #define mtype MTYPE
#define ext_timeout(e, m) \ #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) \ #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)) #define get_ext(map, id) ((map)->extensions + (map)->dsize * (id))
static void static void

10
net/netfilter/ipset/ip_set_bitmap_ip.c
View File

@ -45,7 +45,7 @@ struct bitmap_ip {
u32 hosts; /* number of hosts in a subnet */ u32 hosts; /* number of hosts in a subnet */
size_t memsize; /* members size */ size_t memsize; /* members size */
size_t dsize; /* extensions struct 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 */ u8 netmask; /* subnet netmask */
u32 timeout; /* timeout parameter */ u32 timeout; /* timeout parameter */
struct timer_list gc; /* garbage collection */ 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; set->extensions |= IPSET_EXT_COUNTER;
if (tb[IPSET_ATTR_TIMEOUT]) { if (tb[IPSET_ATTR_TIMEOUT]) {
map->dsize = sizeof(struct bitmap_ipct_elem); map->dsize = sizeof(struct bitmap_ipct_elem);
map->offset[IPSET_OFFSET_TIMEOUT] = map->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct bitmap_ipct_elem, timeout); offsetof(struct bitmap_ipct_elem, timeout);
map->offset[IPSET_OFFSET_COUNTER] = map->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct bitmap_ipct_elem, counter); offsetof(struct bitmap_ipct_elem, counter);
if (!init_map_ip(set, map, first_ip, last_ip, 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); bitmap_ip_gc_init(set, bitmap_ip_gc);
} else { } else {
map->dsize = sizeof(struct bitmap_ipc_elem); map->dsize = sizeof(struct bitmap_ipc_elem);
map->offset[IPSET_OFFSET_COUNTER] = map->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct bitmap_ipc_elem, counter); offsetof(struct bitmap_ipc_elem, counter);
if (!init_map_ip(set, map, first_ip, last_ip, 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]) { } else if (tb[IPSET_ATTR_TIMEOUT]) {
map->dsize = sizeof(struct bitmap_ipt_elem); map->dsize = sizeof(struct bitmap_ipt_elem);
map->offset[IPSET_OFFSET_TIMEOUT] = map->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct bitmap_ipt_elem, timeout); offsetof(struct bitmap_ipt_elem, timeout);
if (!init_map_ip(set, map, first_ip, last_ip, if (!init_map_ip(set, map, first_ip, last_ip,

10
net/netfilter/ipset/ip_set_bitmap_ipmac.c
View File

@ -52,7 +52,7 @@ struct bitmap_ipmac {
struct timer_list gc; /* garbage collector */ struct timer_list gc; /* garbage collector */
size_t memsize; /* members size */ size_t memsize; /* members size */
size_t dsize; /* size of element */ 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 */ /* 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; set->extensions |= IPSET_EXT_COUNTER;
if (tb[IPSET_ATTR_TIMEOUT]) { if (tb[IPSET_ATTR_TIMEOUT]) {
map->dsize = sizeof(struct bitmap_ipmacct_elem); map->dsize = sizeof(struct bitmap_ipmacct_elem);
map->offset[IPSET_OFFSET_TIMEOUT] = map->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct bitmap_ipmacct_elem, timeout); offsetof(struct bitmap_ipmacct_elem, timeout);
map->offset[IPSET_OFFSET_COUNTER] = map->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct bitmap_ipmacct_elem, counter); offsetof(struct bitmap_ipmacct_elem, counter);
if (!init_map_ipmac(set, map, first_ip, last_ip, 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); bitmap_ipmac_gc_init(set, bitmap_ipmac_gc);
} else { } else {
map->dsize = sizeof(struct bitmap_ipmacc_elem); map->dsize = sizeof(struct bitmap_ipmacc_elem);
map->offset[IPSET_OFFSET_COUNTER] = map->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct bitmap_ipmacc_elem, counter); offsetof(struct bitmap_ipmacc_elem, counter);
if (!init_map_ipmac(set, map, first_ip, last_ip, 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]) { } else if (tb[IPSET_ATTR_TIMEOUT]) {
map->dsize = sizeof(struct bitmap_ipmact_elem); map->dsize = sizeof(struct bitmap_ipmact_elem);
map->offset[IPSET_OFFSET_TIMEOUT] = map->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct bitmap_ipmact_elem, timeout); offsetof(struct bitmap_ipmact_elem, timeout);
if (!init_map_ipmac(set, map, first_ip, last_ip, elements)) { if (!init_map_ipmac(set, map, first_ip, last_ip, elements)) {

10
net/netfilter/ipset/ip_set_bitmap_port.c
View File

@ -39,7 +39,7 @@ struct bitmap_port {
u32 elements; /* number of max elements in the set */ u32 elements; /* number of max elements in the set */
size_t memsize; /* members size */ size_t memsize; /* members size */
size_t dsize; /* extensions struct 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 */ u32 timeout; /* timeout parameter */
struct timer_list gc; /* garbage collection */ 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; set->extensions |= IPSET_EXT_COUNTER;
if (tb[IPSET_ATTR_TIMEOUT]) { if (tb[IPSET_ATTR_TIMEOUT]) {
map->dsize = sizeof(struct bitmap_portct_elem); map->dsize = sizeof(struct bitmap_portct_elem);
map->offset[IPSET_OFFSET_TIMEOUT] = map->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct bitmap_portct_elem, timeout); offsetof(struct bitmap_portct_elem, timeout);
map->offset[IPSET_OFFSET_COUNTER] = map->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct bitmap_portct_elem, counter); offsetof(struct bitmap_portct_elem, counter);
if (!init_map_port(set, map, first_port, last_port)) { if (!init_map_port(set, map, first_port, last_port)) {
kfree(map); 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); bitmap_port_gc_init(set, bitmap_port_gc);
} else { } else {
map->dsize = sizeof(struct bitmap_portc_elem); map->dsize = sizeof(struct bitmap_portc_elem);
map->offset[IPSET_OFFSET_COUNTER] = map->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct bitmap_portc_elem, counter); offsetof(struct bitmap_portc_elem, counter);
if (!init_map_port(set, map, first_port, last_port)) { if (!init_map_port(set, map, first_port, last_port)) {
kfree(map); kfree(map);
@ -306,7 +306,7 @@ bitmap_port_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
} }
} else if (tb[IPSET_ATTR_TIMEOUT]) { } else if (tb[IPSET_ATTR_TIMEOUT]) {
map->dsize = sizeof(struct bitmap_portt_elem); map->dsize = sizeof(struct bitmap_portt_elem);
map->offset[IPSET_OFFSET_TIMEOUT] = map->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct bitmap_portt_elem, timeout); offsetof(struct bitmap_portt_elem, timeout);
if (!init_map_port(set, map, first_port, last_port)) { if (!init_map_port(set, map, first_port, last_port)) {
kfree(map); kfree(map);

22
net/netfilter/ipset/ip_set_hash_gen.h
View File

@ -179,9 +179,9 @@ hbucket_elem_add(struct hbucket *n, u8 ahash_max, size_t dsize)
#endif /* IP_SET_HASH_WITH_NETS */ #endif /* IP_SET_HASH_WITH_NETS */
#define ext_timeout(e, h) \ #define ext_timeout(e, h) \
(unsigned long *)(((void *)(e)) + (h)->offset[IPSET_OFFSET_TIMEOUT]) (unsigned long *)(((void *)(e)) + (h)->offset[IPSET_EXT_ID_TIMEOUT])
#define ext_counter(e, h) \ #define ext_counter(e, h) \
(struct ip_set_counter *)(((void *)(e)) + (h)->offset[IPSET_OFFSET_COUNTER]) (struct ip_set_counter *)(((void *)(e)) + (h)->offset[IPSET_EXT_ID_COUNTER])
#endif /* _IP_SET_HASH_GEN_H */ #endif /* _IP_SET_HASH_GEN_H */
@ -278,7 +278,7 @@ struct htype {
u32 initval; /* random jhash init value */ u32 initval; /* random jhash init value */
u32 timeout; /* timeout value, if enabled */ u32 timeout; /* timeout value, if enabled */
size_t dsize; /* data struct size */ size_t dsize; /* data struct size */
size_t offset[IPSET_OFFSET_MAX]; /* Offsets to extensions */ size_t offset[IPSET_EXT_ID_MAX]; /* Offsets to extensions */
struct timer_list gc; /* garbage collection when timeout enabled */ struct timer_list gc; /* garbage collection when timeout enabled */
struct mtype_elem next; /* temporary storage for uadd */ struct mtype_elem next; /* temporary storage for uadd */
#ifdef IP_SET_HASH_WITH_MULTI #ifdef IP_SET_HASH_WITH_MULTI
@ -1059,11 +1059,11 @@ IPSET_TOKEN(HTYPE, _create)(struct ip_set *set, struct nlattr *tb[], u32 flags)
if (set->family == NFPROTO_IPV4) { if (set->family == NFPROTO_IPV4) {
h->dsize = sizeof(struct h->dsize = sizeof(struct
IPSET_TOKEN(HTYPE, 4ct_elem)); IPSET_TOKEN(HTYPE, 4ct_elem));
h->offset[IPSET_OFFSET_TIMEOUT] = h->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct offsetof(struct
IPSET_TOKEN(HTYPE, 4ct_elem), IPSET_TOKEN(HTYPE, 4ct_elem),
timeout); timeout);
h->offset[IPSET_OFFSET_COUNTER] = h->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct offsetof(struct
IPSET_TOKEN(HTYPE, 4ct_elem), IPSET_TOKEN(HTYPE, 4ct_elem),
counter); counter);
@ -1072,11 +1072,11 @@ IPSET_TOKEN(HTYPE, _create)(struct ip_set *set, struct nlattr *tb[], u32 flags)
} else { } else {
h->dsize = sizeof(struct h->dsize = sizeof(struct
IPSET_TOKEN(HTYPE, 6ct_elem)); IPSET_TOKEN(HTYPE, 6ct_elem));
h->offset[IPSET_OFFSET_TIMEOUT] = h->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct offsetof(struct
IPSET_TOKEN(HTYPE, 6ct_elem), IPSET_TOKEN(HTYPE, 6ct_elem),
timeout); timeout);
h->offset[IPSET_OFFSET_COUNTER] = h->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct offsetof(struct
IPSET_TOKEN(HTYPE, 6ct_elem), IPSET_TOKEN(HTYPE, 6ct_elem),
counter); counter);
@ -1088,7 +1088,7 @@ IPSET_TOKEN(HTYPE, _create)(struct ip_set *set, struct nlattr *tb[], u32 flags)
h->dsize = h->dsize =
sizeof(struct sizeof(struct
IPSET_TOKEN(HTYPE, 4c_elem)); IPSET_TOKEN(HTYPE, 4c_elem));
h->offset[IPSET_OFFSET_COUNTER] = h->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct offsetof(struct
IPSET_TOKEN(HTYPE, 4c_elem), IPSET_TOKEN(HTYPE, 4c_elem),
counter); counter);
@ -1096,7 +1096,7 @@ IPSET_TOKEN(HTYPE, _create)(struct ip_set *set, struct nlattr *tb[], u32 flags)
h->dsize = h->dsize =
sizeof(struct sizeof(struct
IPSET_TOKEN(HTYPE, 6c_elem)); IPSET_TOKEN(HTYPE, 6c_elem));
h->offset[IPSET_OFFSET_COUNTER] = h->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct offsetof(struct
IPSET_TOKEN(HTYPE, 6c_elem), IPSET_TOKEN(HTYPE, 6c_elem),
counter); counter);
@ -1107,14 +1107,14 @@ IPSET_TOKEN(HTYPE, _create)(struct ip_set *set, struct nlattr *tb[], u32 flags)
set->extensions |= IPSET_EXT_TIMEOUT; set->extensions |= IPSET_EXT_TIMEOUT;
if (set->family == NFPROTO_IPV4) { if (set->family == NFPROTO_IPV4) {
h->dsize = sizeof(struct IPSET_TOKEN(HTYPE, 4t_elem)); h->dsize = sizeof(struct IPSET_TOKEN(HTYPE, 4t_elem));
h->offset[IPSET_OFFSET_TIMEOUT] = h->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct IPSET_TOKEN(HTYPE, 4t_elem), offsetof(struct IPSET_TOKEN(HTYPE, 4t_elem),
timeout); timeout);
IPSET_TOKEN(HTYPE, 4_gc_init)(set, IPSET_TOKEN(HTYPE, 4_gc_init)(set,
IPSET_TOKEN(HTYPE, 4_gc)); IPSET_TOKEN(HTYPE, 4_gc));
} else { } else {
h->dsize = sizeof(struct IPSET_TOKEN(HTYPE, 6t_elem)); h->dsize = sizeof(struct IPSET_TOKEN(HTYPE, 6t_elem));
h->offset[IPSET_OFFSET_TIMEOUT] = h->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct IPSET_TOKEN(HTYPE, 6t_elem), offsetof(struct IPSET_TOKEN(HTYPE, 6t_elem),
timeout); timeout);
IPSET_TOKEN(HTYPE, 6_gc_init)(set, IPSET_TOKEN(HTYPE, 6_gc_init)(set,

14
net/netfilter/ipset/ip_set_list_set.c
View File

@ -59,7 +59,7 @@ struct set_adt_elem {
/* Type structure */ /* Type structure */
struct list_set { struct list_set {
size_t dsize; /* element size */ size_t dsize; /* element size */
size_t offset[IPSET_OFFSET_MAX]; /* Offsets to extensions */ size_t offset[IPSET_EXT_ID_MAX]; /* Offsets to extensions */
u32 size; /* size of set list array */ u32 size; /* size of set list array */
u32 timeout; /* timeout value */ u32 timeout; /* timeout value */
struct timer_list gc; /* garbage collection */ struct timer_list gc; /* garbage collection */
@ -73,9 +73,9 @@ list_set_elem(const struct list_set *map, u32 id)
} }
#define ext_timeout(e, m) \ #define ext_timeout(e, m) \
(unsigned long *)((void *)(e) + (m)->offset[IPSET_OFFSET_TIMEOUT]) (unsigned long *)((void *)(e) + (m)->offset[IPSET_EXT_ID_TIMEOUT])
#define ext_counter(e, m) \ #define ext_counter(e, m) \
(struct ip_set_counter *)((void *)(e) + (m)->offset[IPSET_OFFSET_COUNTER]) (struct ip_set_counter *)((void *)(e) + (m)->offset[IPSET_EXT_ID_COUNTER])
static int static int
list_set_ktest(struct ip_set *set, const struct sk_buff *skb, list_set_ktest(struct ip_set *set, const struct sk_buff *skb,
@ -667,9 +667,9 @@ list_set_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
if (!map) if (!map)
return -ENOMEM; return -ENOMEM;
set->extensions |= IPSET_EXT_TIMEOUT; set->extensions |= IPSET_EXT_TIMEOUT;
map->offset[IPSET_OFFSET_TIMEOUT] = map->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct setct_elem, timeout); offsetof(struct setct_elem, timeout);
map->offset[IPSET_OFFSET_COUNTER] = map->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct setct_elem, counter); offsetof(struct setct_elem, counter);
list_set_gc_init(set, list_set_gc); list_set_gc_init(set, list_set_gc);
} else { } else {
@ -677,7 +677,7 @@ list_set_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
sizeof(struct setc_elem), 0); sizeof(struct setc_elem), 0);
if (!map) if (!map)
return -ENOMEM; return -ENOMEM;
map->offset[IPSET_OFFSET_COUNTER] = map->offset[IPSET_EXT_ID_COUNTER] =
offsetof(struct setc_elem, counter); offsetof(struct setc_elem, counter);
} }
} else if (tb[IPSET_ATTR_TIMEOUT]) { } else if (tb[IPSET_ATTR_TIMEOUT]) {
@ -686,7 +686,7 @@ list_set_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
if (!map) if (!map)
return -ENOMEM; return -ENOMEM;
set->extensions |= IPSET_EXT_TIMEOUT; set->extensions |= IPSET_EXT_TIMEOUT;
map->offset[IPSET_OFFSET_TIMEOUT] = map->offset[IPSET_EXT_ID_TIMEOUT] =
offsetof(struct sett_elem, timeout); offsetof(struct sett_elem, timeout);
list_set_gc_init(set, list_set_gc); list_set_gc_init(set, list_set_gc);
} else { } else {