From: Florian Westphal <fw@strlen.de>
Date: Thu, 15 Oct 2020 14:47:21 +0000 (+0200)
Subject: segtree: copy expr data to closing element
X-Git-Tag: v0.9.7~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1f0476fd590;p=thirdparty%2Fnftables.git

segtree: copy expr data to closing element

When last expr has no closing element we did not propagate
expr properties such as comment or expire date to the newly
allocated set elem.

Before:
nft create table t
nft 'add set t s { type ipv4_addr; flags interval; timeout 60s; }'
nft add element t s { 224.0.0.0/3 }
nft list set t s | grep -o 'elements.*'
elements = { 224.0.0.0-255.255.255.255 }

nft flush set t s
nft add element t s { 224.0.0.0/4, 240.0.0.0/4 }
nft list set t s | grep -o 'elements.*'
elements = { 224.0.0.0/4 expires 55s152ms, 240.0.0.0-255.255.255.255 }

nft delete set t s
nft 'add set t s { type ipv4_addr; flags interval; auto-merge; timeout 60s; }'
nft add element t s { 224.0.0.0/4, 240.0.0.0/4 }
nft list set t s | grep -o 'elements.*'
elements = { 224.0.0.0-255.255.255.255 }

After:
elements = { 224.0.0.0-255.255.255.255 expires 58s515ms }
elements = { 224.0.0.0/4 expires 54s622ms, 240.0.0.0-255.255.255.255 expires 54s622ms }
elements = { 224.0.0.0-255.255.255.255 expires 57s92ms }

Bugzilla: https://bugzilla.netfilter.org/show_bug.cgi?id=1454
Signed-off-by: Florian Westphal <fw@strlen.de>
---

diff --git a/src/segtree.c b/src/segtree.c
index 3a641bc5..ec281359 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -927,6 +927,20 @@ next:
 	}
 }
 
+static void interval_expr_copy(struct expr *dst, struct expr *src)
+{
+	if (src->comment)
+		dst->comment = xstrdup(src->comment);
+	if (src->timeout)
+		dst->timeout = src->timeout;
+	if (src->expiration)
+		dst->expiration = src->expiration;
+	if (src->stmt) {
+		dst->stmt = src->stmt;
+		src->stmt = NULL;
+	}
+}
+
 void interval_map_decompose(struct expr *set)
 {
 	struct expr **elements, **ranges;
@@ -1016,30 +1030,12 @@ void interval_map_decompose(struct expr *set)
 			tmp = set_elem_expr_alloc(&low->location, tmp);
 
 			if (low->etype == EXPR_MAPPING) {
-				if (low->left->comment)
-					tmp->comment = xstrdup(low->left->comment);
-				if (low->left->timeout)
-					tmp->timeout = low->left->timeout;
-				if (low->left->expiration)
-					tmp->expiration = low->left->expiration;
-				if (low->left->stmt) {
-					tmp->stmt = low->left->stmt;
-					low->left->stmt = NULL;
-				}
+				interval_expr_copy(tmp, low->left);
 
 				tmp = mapping_expr_alloc(&tmp->location, tmp,
 							 expr_clone(low->right));
 			} else {
-				if (low->comment)
-					tmp->comment = xstrdup(low->comment);
-				if (low->timeout)
-					tmp->timeout = low->timeout;
-				if (low->expiration)
-					tmp->expiration = low->expiration;
-				if (low->stmt) {
-					tmp->stmt = low->stmt;
-					low->stmt = NULL;
-				}
+				interval_expr_copy(tmp, low);
 			}
 
 			compound_expr_add(set, tmp);
@@ -1056,30 +1052,12 @@ void interval_map_decompose(struct expr *set)
 			prefix = set_elem_expr_alloc(&low->location, prefix);
 
 			if (low->etype == EXPR_MAPPING) {
-				if (low->left->comment)
-					prefix->comment = xstrdup(low->left->comment);
-				if (low->left->timeout)
-					prefix->timeout = low->left->timeout;
-				if (low->left->expiration)
-					prefix->expiration = low->left->expiration;
-				if (low->left->stmt) {
-					prefix->stmt = low->left->stmt;
-					low->left->stmt = NULL;
-				}
+				interval_expr_copy(prefix, low->left);
 
 				prefix = mapping_expr_alloc(&low->location, prefix,
 							    expr_clone(low->right));
 			} else {
-				if (low->comment)
-					prefix->comment = xstrdup(low->comment);
-				if (low->timeout)
-					prefix->timeout = low->timeout;
-				if (low->expiration)
-					prefix->expiration = low->expiration;
-				if (low->stmt) {
-					prefix->stmt = low->stmt;
-					low->stmt = NULL;
-				}
+				interval_expr_copy(prefix, low);
 			}
 
 			compound_expr_add(set, prefix);
@@ -1110,6 +1088,7 @@ void interval_map_decompose(struct expr *set)
 			i = mapping_expr_alloc(&i->location, i,
 					       expr_clone(low->right));
 
+		interval_expr_copy(i, low);
 		expr_free(low);
 	}