Skip to content

Commit f925f70

Browse files
author
Jozsef Kadlecsik
committed
netfilter: ipset: Rename extension offset ids to extension ids
Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
1 parent a04d8b6 commit f925f70

File tree

7 files changed

+43
-43
lines changed

7 files changed

+43
-43
lines changed

‎include/linux/netfilter/ipset/ip_set.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@ enum ip_set_extension {
5656
IPSET_EXT_COUNTER = (1 << IPSET_EXT_BIT_COUNTER),
5757
};
5858

59-
/* Extension offsets */
60-
enum ip_set_offset {
61-
IPSET_OFFSET_TIMEOUT = 0,
62-
IPSET_OFFSET_COUNTER,
63-
IPSET_OFFSET_MAX,
64-
};
65-
6659
#define SET_WITH_TIMEOUT(s) ((s)->extensions & IPSET_EXT_TIMEOUT)
6760
#define SET_WITH_COUNTER(s) ((s)->extensions & IPSET_EXT_COUNTER)
6861

62+
/* Extension id, in size order */
63+
enum ip_set_ext_id {
64+
IPSET_EXT_ID_COUNTER = 0,
65+
IPSET_EXT_ID_TIMEOUT,
66+
IPSET_EXT_ID_MAX,
67+
};
68+
6969
struct ip_set_ext {
70-
u32 timeout;
7170
u64 packets;
7271
u64 bytes;
72+
u32 timeout;
7373
};
7474

7575
struct ip_set;

‎net/netfilter/ipset/ip_set_bitmap_gen.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
#define mtype MTYPE
3434

3535
#define ext_timeout(e, m) \
36-
(unsigned long *)((e) + (m)->offset[IPSET_OFFSET_TIMEOUT])
36+
(unsigned long *)((e) + (m)->offset[IPSET_EXT_ID_TIMEOUT])
3737
#define ext_counter(e, m) \
38-
(struct ip_set_counter *)((e) + (m)->offset[IPSET_OFFSET_COUNTER])
38+
(struct ip_set_counter *)((e) + (m)->offset[IPSET_EXT_ID_COUNTER])
3939
#define get_ext(map, id) ((map)->extensions + (map)->dsize * (id))
4040

4141
static void

‎net/netfilter/ipset/ip_set_bitmap_ip.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct bitmap_ip {
4545
u32 hosts; /* number of hosts in a subnet */
4646
size_t memsize; /* members size */
4747
size_t dsize; /* extensions struct size */
48-
size_t offset[IPSET_OFFSET_MAX]; /* Offsets to extensions */
48+
size_t offset[IPSET_EXT_ID_MAX]; /* Offsets to extensions */
4949
u8 netmask; /* subnet netmask */
5050
u32 timeout; /* timeout parameter */
5151
struct timer_list gc; /* garbage collection */
@@ -342,9 +342,9 @@ bitmap_ip_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
342342
set->extensions |= IPSET_EXT_COUNTER;
343343
if (tb[IPSET_ATTR_TIMEOUT]) {
344344
map->dsize = sizeof(struct bitmap_ipct_elem);
345-
map->offset[IPSET_OFFSET_TIMEOUT] =
345+
map->offset[IPSET_EXT_ID_TIMEOUT] =
346346
offsetof(struct bitmap_ipct_elem, timeout);
347-
map->offset[IPSET_OFFSET_COUNTER] =
347+
map->offset[IPSET_EXT_ID_COUNTER] =
348348
offsetof(struct bitmap_ipct_elem, counter);
349349

350350
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)
360360
bitmap_ip_gc_init(set, bitmap_ip_gc);
361361
} else {
362362
map->dsize = sizeof(struct bitmap_ipc_elem);
363-
map->offset[IPSET_OFFSET_COUNTER] =
363+
map->offset[IPSET_EXT_ID_COUNTER] =
364364
offsetof(struct bitmap_ipc_elem, counter);
365365

366366
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)
371371
}
372372
} else if (tb[IPSET_ATTR_TIMEOUT]) {
373373
map->dsize = sizeof(struct bitmap_ipt_elem);
374-
map->offset[IPSET_OFFSET_TIMEOUT] =
374+
map->offset[IPSET_EXT_ID_TIMEOUT] =
375375
offsetof(struct bitmap_ipt_elem, timeout);
376376

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

‎net/netfilter/ipset/ip_set_bitmap_ipmac.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ struct bitmap_ipmac {
5252
struct timer_list gc; /* garbage collector */
5353
size_t memsize; /* members size */
5454
size_t dsize; /* size of element */
55-
size_t offset[IPSET_OFFSET_MAX]; /* Offsets to extensions */
55+
size_t offset[IPSET_EXT_ID_MAX]; /* Offsets to extensions */
5656
};
5757

5858
/* ADT structure for generic function args */
@@ -405,9 +405,9 @@ bitmap_ipmac_create(struct ip_set *set, struct nlattr *tb[],
405405
set->extensions |= IPSET_EXT_COUNTER;
406406
if (tb[IPSET_ATTR_TIMEOUT]) {
407407
map->dsize = sizeof(struct bitmap_ipmacct_elem);
408-
map->offset[IPSET_OFFSET_TIMEOUT] =
408+
map->offset[IPSET_EXT_ID_TIMEOUT] =
409409
offsetof(struct bitmap_ipmacct_elem, timeout);
410-
map->offset[IPSET_OFFSET_COUNTER] =
410+
map->offset[IPSET_EXT_ID_COUNTER] =
411411
offsetof(struct bitmap_ipmacct_elem, counter);
412412

413413
if (!init_map_ipmac(set, map, first_ip, last_ip,
@@ -421,7 +421,7 @@ bitmap_ipmac_create(struct ip_set *set, struct nlattr *tb[],
421421
bitmap_ipmac_gc_init(set, bitmap_ipmac_gc);
422422
} else {
423423
map->dsize = sizeof(struct bitmap_ipmacc_elem);
424-
map->offset[IPSET_OFFSET_COUNTER] =
424+
map->offset[IPSET_EXT_ID_COUNTER] =
425425
offsetof(struct bitmap_ipmacc_elem, counter);
426426

427427
if (!init_map_ipmac(set, map, first_ip, last_ip,
@@ -432,7 +432,7 @@ bitmap_ipmac_create(struct ip_set *set, struct nlattr *tb[],
432432
}
433433
} else if (tb[IPSET_ATTR_TIMEOUT]) {
434434
map->dsize = sizeof(struct bitmap_ipmact_elem);
435-
map->offset[IPSET_OFFSET_TIMEOUT] =
435+
map->offset[IPSET_EXT_ID_TIMEOUT] =
436436
offsetof(struct bitmap_ipmact_elem, timeout);
437437

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

‎net/netfilter/ipset/ip_set_bitmap_port.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ struct bitmap_port {
3939
u32 elements; /* number of max elements in the set */
4040
size_t memsize; /* members size */
4141
size_t dsize; /* extensions struct size */
42-
size_t offset[IPSET_OFFSET_MAX]; /* Offsets to extensions */
42+
size_t offset[IPSET_EXT_ID_MAX]; /* Offsets to extensions */
4343
u32 timeout; /* timeout parameter */
4444
struct timer_list gc; /* garbage collection */
4545
};
@@ -282,9 +282,9 @@ bitmap_port_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
282282
set->extensions |= IPSET_EXT_COUNTER;
283283
if (tb[IPSET_ATTR_TIMEOUT]) {
284284
map->dsize = sizeof(struct bitmap_portct_elem);
285-
map->offset[IPSET_OFFSET_TIMEOUT] =
285+
map->offset[IPSET_EXT_ID_TIMEOUT] =
286286
offsetof(struct bitmap_portct_elem, timeout);
287-
map->offset[IPSET_OFFSET_COUNTER] =
287+
map->offset[IPSET_EXT_ID_COUNTER] =
288288
offsetof(struct bitmap_portct_elem, counter);
289289
if (!init_map_port(set, map, first_port, last_port)) {
290290
kfree(map);
@@ -297,7 +297,7 @@ bitmap_port_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
297297
bitmap_port_gc_init(set, bitmap_port_gc);
298298
} else {
299299
map->dsize = sizeof(struct bitmap_portc_elem);
300-
map->offset[IPSET_OFFSET_COUNTER] =
300+
map->offset[IPSET_EXT_ID_COUNTER] =
301301
offsetof(struct bitmap_portc_elem, counter);
302302
if (!init_map_port(set, map, first_port, last_port)) {
303303
kfree(map);
@@ -306,7 +306,7 @@ bitmap_port_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
306306
}
307307
} else if (tb[IPSET_ATTR_TIMEOUT]) {
308308
map->dsize = sizeof(struct bitmap_portt_elem);
309-
map->offset[IPSET_OFFSET_TIMEOUT] =
309+
map->offset[IPSET_EXT_ID_TIMEOUT] =
310310
offsetof(struct bitmap_portt_elem, timeout);
311311
if (!init_map_port(set, map, first_port, last_port)) {
312312
kfree(map);

‎net/netfilter/ipset/ip_set_hash_gen.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,9 @@ hbucket_elem_add(struct hbucket *n, u8 ahash_max, size_t dsize)
179179
#endif /* IP_SET_HASH_WITH_NETS */
180180

181181
#define ext_timeout(e, h) \
182-
(unsigned long *)(((void *)(e)) + (h)->offset[IPSET_OFFSET_TIMEOUT])
182+
(unsigned long *)(((void *)(e)) + (h)->offset[IPSET_EXT_ID_TIMEOUT])
183183
#define ext_counter(e, h) \
184-
(struct ip_set_counter *)(((void *)(e)) + (h)->offset[IPSET_OFFSET_COUNTER])
184+
(struct ip_set_counter *)(((void *)(e)) + (h)->offset[IPSET_EXT_ID_COUNTER])
185185

186186
#endif /* _IP_SET_HASH_GEN_H */
187187

@@ -278,7 +278,7 @@ struct htype {
278278
u32 initval; /* random jhash init value */
279279
u32 timeout; /* timeout value, if enabled */
280280
size_t dsize; /* data struct size */
281-
size_t offset[IPSET_OFFSET_MAX]; /* Offsets to extensions */
281+
size_t offset[IPSET_EXT_ID_MAX]; /* Offsets to extensions */
282282
struct timer_list gc; /* garbage collection when timeout enabled */
283283
struct mtype_elem next; /* temporary storage for uadd */
284284
#ifdef IP_SET_HASH_WITH_MULTI
@@ -1059,11 +1059,11 @@ IPSET_TOKEN(HTYPE, _create)(struct ip_set *set, struct nlattr *tb[], u32 flags)
10591059
if (set->family == NFPROTO_IPV4) {
10601060
h->dsize = sizeof(struct
10611061
IPSET_TOKEN(HTYPE, 4ct_elem));
1062-
h->offset[IPSET_OFFSET_TIMEOUT] =
1062+
h->offset[IPSET_EXT_ID_TIMEOUT] =
10631063
offsetof(struct
10641064
IPSET_TOKEN(HTYPE, 4ct_elem),
10651065
timeout);
1066-
h->offset[IPSET_OFFSET_COUNTER] =
1066+
h->offset[IPSET_EXT_ID_COUNTER] =
10671067
offsetof(struct
10681068
IPSET_TOKEN(HTYPE, 4ct_elem),
10691069
counter);
@@ -1072,11 +1072,11 @@ IPSET_TOKEN(HTYPE, _create)(struct ip_set *set, struct nlattr *tb[], u32 flags)
10721072
} else {
10731073
h->dsize = sizeof(struct
10741074
IPSET_TOKEN(HTYPE, 6ct_elem));
1075-
h->offset[IPSET_OFFSET_TIMEOUT] =
1075+
h->offset[IPSET_EXT_ID_TIMEOUT] =
10761076
offsetof(struct
10771077
IPSET_TOKEN(HTYPE, 6ct_elem),
10781078
timeout);
1079-
h->offset[IPSET_OFFSET_COUNTER] =
1079+
h->offset[IPSET_EXT_ID_COUNTER] =
10801080
offsetof(struct
10811081
IPSET_TOKEN(HTYPE, 6ct_elem),
10821082
counter);
@@ -1088,15 +1088,15 @@ IPSET_TOKEN(HTYPE, _create)(struct ip_set *set, struct nlattr *tb[], u32 flags)
10881088
h->dsize =
10891089
sizeof(struct
10901090
IPSET_TOKEN(HTYPE, 4c_elem));
1091-
h->offset[IPSET_OFFSET_COUNTER] =
1091+
h->offset[IPSET_EXT_ID_COUNTER] =
10921092
offsetof(struct
10931093
IPSET_TOKEN(HTYPE, 4c_elem),
10941094
counter);
10951095
} else {
10961096
h->dsize =
10971097
sizeof(struct
10981098
IPSET_TOKEN(HTYPE, 6c_elem));
1099-
h->offset[IPSET_OFFSET_COUNTER] =
1099+
h->offset[IPSET_EXT_ID_COUNTER] =
11001100
offsetof(struct
11011101
IPSET_TOKEN(HTYPE, 6c_elem),
11021102
counter);
@@ -1107,14 +1107,14 @@ IPSET_TOKEN(HTYPE, _create)(struct ip_set *set, struct nlattr *tb[], u32 flags)
11071107
set->extensions |= IPSET_EXT_TIMEOUT;
11081108
if (set->family == NFPROTO_IPV4) {
11091109
h->dsize = sizeof(struct IPSET_TOKEN(HTYPE, 4t_elem));
1110-
h->offset[IPSET_OFFSET_TIMEOUT] =
1110+
h->offset[IPSET_EXT_ID_TIMEOUT] =
11111111
offsetof(struct IPSET_TOKEN(HTYPE, 4t_elem),
11121112
timeout);
11131113
IPSET_TOKEN(HTYPE, 4_gc_init)(set,
11141114
IPSET_TOKEN(HTYPE, 4_gc));
11151115
} else {
11161116
h->dsize = sizeof(struct IPSET_TOKEN(HTYPE, 6t_elem));
1117-
h->offset[IPSET_OFFSET_TIMEOUT] =
1117+
h->offset[IPSET_EXT_ID_TIMEOUT] =
11181118
offsetof(struct IPSET_TOKEN(HTYPE, 6t_elem),
11191119
timeout);
11201120
IPSET_TOKEN(HTYPE, 6_gc_init)(set,

‎net/netfilter/ipset/ip_set_list_set.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ struct set_adt_elem {
5959
/* Type structure */
6060
struct list_set {
6161
size_t dsize; /* element size */
62-
size_t offset[IPSET_OFFSET_MAX]; /* Offsets to extensions */
62+
size_t offset[IPSET_EXT_ID_MAX]; /* Offsets to extensions */
6363
u32 size; /* size of set list array */
6464
u32 timeout; /* timeout value */
6565
struct timer_list gc; /* garbage collection */
@@ -73,9 +73,9 @@ list_set_elem(const struct list_set *map, u32 id)
7373
}
7474

7575
#define ext_timeout(e, m) \
76-
(unsigned long *)((void *)(e) + (m)->offset[IPSET_OFFSET_TIMEOUT])
76+
(unsigned long *)((void *)(e) + (m)->offset[IPSET_EXT_ID_TIMEOUT])
7777
#define ext_counter(e, m) \
78-
(struct ip_set_counter *)((void *)(e) + (m)->offset[IPSET_OFFSET_COUNTER])
78+
(struct ip_set_counter *)((void *)(e) + (m)->offset[IPSET_EXT_ID_COUNTER])
7979

8080
static int
8181
list_set_ktest(struct ip_set *set, const struct sk_buff *skb,
@@ -667,17 +667,17 @@ list_set_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
667667
if (!map)
668668
return -ENOMEM;
669669
set->extensions |= IPSET_EXT_TIMEOUT;
670-
map->offset[IPSET_OFFSET_TIMEOUT] =
670+
map->offset[IPSET_EXT_ID_TIMEOUT] =
671671
offsetof(struct setct_elem, timeout);
672-
map->offset[IPSET_OFFSET_COUNTER] =
672+
map->offset[IPSET_EXT_ID_COUNTER] =
673673
offsetof(struct setct_elem, counter);
674674
list_set_gc_init(set, list_set_gc);
675675
} else {
676676
map = init_list_set(set, size,
677677
sizeof(struct setc_elem), 0);
678678
if (!map)
679679
return -ENOMEM;
680-
map->offset[IPSET_OFFSET_COUNTER] =
680+
map->offset[IPSET_EXT_ID_COUNTER] =
681681
offsetof(struct setc_elem, counter);
682682
}
683683
} else if (tb[IPSET_ATTR_TIMEOUT]) {
@@ -686,7 +686,7 @@ list_set_create(struct ip_set *set, struct nlattr *tb[], u32 flags)
686686
if (!map)
687687
return -ENOMEM;
688688
set->extensions |= IPSET_EXT_TIMEOUT;
689-
map->offset[IPSET_OFFSET_TIMEOUT] =
689+
map->offset[IPSET_EXT_ID_TIMEOUT] =
690690
offsetof(struct sett_elem, timeout);
691691
list_set_gc_init(set, list_set_gc);
692692
} else {

0 commit comments

Comments
 (0)