Revert "intervals: do not merge intervals with different timeout"
Pablo Neira Ayuso
maintainerPATCH 1/1 Revert "intervals: do not merge intervals with different timeout"
This reverts commit da0bac050c8b2588242727f9915a1ea8bc48ceb2.
This results in an error when adding an interval that overlaps an existing interval in the kernel, this defeats the purpose of the auto-merge feature.
--- src/intervals.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
src/intervals.c +1 -5
@@ -162,8 +162,6 @@ static void set_prev_elem(struct expr **prev, struct expr *i,mpz_set (prev_range->high, range->high); } -static struct expr *interval_expr_key (struct expr *i); -static void setelem_automerge (struct set_automerge_ctx *ctx) {struct expr *i, *next, *prev =NULL ;
@@ -183,9 +181,7 @@ static void setelem_automerge(struct set_automerge_ctx *ctx)range_expr_value_low (range.low, i);range_expr_value_high (range.high, i); -if (!prev || -interval_expr_key (prev)->timeout !=interval_expr_key (i)->timeout || -interval_expr_key (prev)->expiration !=interval_expr_key (i)->expiration) { +if (!prev) {set_prev_elem (&prev, i, &prev_range, &range);continue ; }
Signature · 1 line
2.30.2
Florian Westphal
maintainerQuoted 5 lines · Pablo Neira Ayuso
This reverts commit
da0bac050c8b2588242727f9915a1ea8bc48ceb2.This results in an error when adding an interval that overlaps an existing interval in the kernel, this defeats the purpose of the auto-merge feature.
Do we need a new nft release? I'd like to avoid people relying on the 'just reverted' behaviour.
Pablo Neira Ayuso
maintainerQuoted 9 lines · Florian Westphal
Quoted 5 lines · Pablo Neira Ayuso
This reverts commit
da0bac050c8b2588242727f9915a1ea8bc48ceb2.This results in an error when adding an interval that overlaps an existing interval in the kernel, this defeats the purpose of the auto-merge feature.
Do we need a new nft release? I'd like to avoid people relying on the 'just reverted' behaviour.
That's possible, yes.