|
 |
ddb7af |
From 5a1d00b37a06bdf37bf392af05236469b6636fb9 Mon Sep 17 00:00:00 2001
|
|
|
ddb7af |
From: Phil Sutter <psutter@redhat.com>
|
|
|
ddb7af |
Date: Fri, 24 Jun 2022 16:02:59 +0200
|
|
|
ddb7af |
Subject: [PATCH] intervals: do not empty cache for maps
|
|
|
ddb7af |
|
|
|
ddb7af |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1917398
|
|
|
ddb7af |
Upstream Status: nftables commit d434de8b50dcf
|
|
|
ddb7af |
|
|
|
ddb7af |
commit d434de8b50dcf3f5f4ca027e122a7df9d4e5d8e1
|
|
|
ddb7af |
Author: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
ddb7af |
Date: Thu Jun 16 10:53:56 2022 +0200
|
|
|
ddb7af |
|
|
|
ddb7af |
intervals: do not empty cache for maps
|
|
|
ddb7af |
|
|
|
ddb7af |
Translate set element to range and sort in maps for the NFT_SET_MAP
|
|
|
ddb7af |
case, which does not support for automerge yet.
|
|
|
ddb7af |
|
|
|
ddb7af |
Fixes: 81e36530fcac ("src: replace interval segment tree overlap and automerge")
|
|
|
ddb7af |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
ddb7af |
|
|
|
ddb7af |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
ddb7af |
---
|
|
|
ddb7af |
src/intervals.c | 9 ++++++---
|
|
|
ddb7af |
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
ddb7af |
|
|
|
ddb7af |
diff --git a/src/intervals.c b/src/intervals.c
|
|
|
ddb7af |
index 89f5c33..e203413 100644
|
|
|
ddb7af |
--- a/src/intervals.c
|
|
|
ddb7af |
+++ b/src/intervals.c
|
|
|
ddb7af |
@@ -216,6 +216,12 @@ int set_automerge(struct list_head *msgs, struct cmd *cmd, struct set *set,
|
|
|
ddb7af |
struct cmd *purge_cmd;
|
|
|
ddb7af |
struct handle h = {};
|
|
|
ddb7af |
|
|
|
ddb7af |
+ if (set->flags & NFT_SET_MAP) {
|
|
|
ddb7af |
+ set_to_range(init);
|
|
|
ddb7af |
+ list_expr_sort(&init->expressions);
|
|
|
ddb7af |
+ return 0;
|
|
|
ddb7af |
+ }
|
|
|
ddb7af |
+
|
|
|
ddb7af |
if (existing_set) {
|
|
|
ddb7af |
if (existing_set->init) {
|
|
|
ddb7af |
list_splice_init(&existing_set->init->expressions,
|
|
|
ddb7af |
@@ -229,9 +235,6 @@ int set_automerge(struct list_head *msgs, struct cmd *cmd, struct set *set,
|
|
|
ddb7af |
set_to_range(init);
|
|
|
ddb7af |
list_expr_sort(&init->expressions);
|
|
|
ddb7af |
|
|
|
ddb7af |
- if (set->flags & NFT_SET_MAP)
|
|
|
ddb7af |
- return 0;
|
|
|
ddb7af |
-
|
|
|
ddb7af |
ctx.purge = set_expr_alloc(&internal_location, set);
|
|
|
ddb7af |
|
|
|
ddb7af |
setelem_automerge(&ctx;;
|
|
|
ddb7af |
--
|
|
|
ddb7af |
2.36.1
|
|
|
ddb7af |
|