From c54fbd53c73fd0426329bfbeaa99bdda244542a9 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 27 Jun 2015 23:36:20 +0200 Subject: src: early allocation of the set ID By when the set is created, so element in the batch use this set ID as reference. Signed-off-by: Pablo Neira Ayuso --- src/netlink.c | 4 ---- src/rule.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/netlink.c b/src/netlink.c index cff93446..801696c8 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -1128,9 +1128,6 @@ static int netlink_add_set_compat(struct netlink_ctx *ctx, return err; } -/* internal ID to uniquely identify a set in the batch */ -static uint32_t set_id; - static int netlink_add_set_batch(struct netlink_ctx *ctx, const struct handle *h, struct set *set) { @@ -1154,7 +1151,6 @@ static int netlink_add_set_batch(struct netlink_ctx *ctx, if (set->gc_int) nft_set_attr_set_u32(nls, NFT_SET_ATTR_GC_INTERVAL, set->gc_int); - set->handle.set_id = ++set_id; nft_set_attr_set_u32(nls, NFT_SET_ATTR_ID, set->handle.set_id); if (!(set->flags & (SET_F_CONSTANT))) { diff --git a/src/rule.c b/src/rule.c index 741654bd..6e1b823a 100644 --- a/src/rule.c +++ b/src/rule.c @@ -139,12 +139,16 @@ void cache_release(void) cache_initialized = false; } +/* internal ID to uniquely identify a set in the batch */ +static uint32_t set_id; + struct set *set_alloc(const struct location *loc) { struct set *set; set = xzalloc(sizeof(*set)); set->refcnt = 1; + set->handle.set_id = ++set_id; if (loc != NULL) set->location = *loc; return set; -- cgit v1.2.3