By when the set is created, so element in the batch use this set ID as
reference.
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
---
src/netlink.c | 4 ----
src/rule.c | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/netlink.c b/src/netlink.c
index 8ede8e6..0fb7b63 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -1121,9 +1121,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)
{
@@ -1147,7 +1144,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 32c4a15..7f2a27f 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;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
