Blob Blame Raw
From ab62f33df5ef33f6eff8d88d9475a01822a2f625 Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Tue, 30 Jun 2020 16:20:22 +0200
Subject: [PATCH] segtree: Fix missing expires value in prefixes

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1832235
Upstream Status: nftables commit 60ba9c22fecc0

commit 60ba9c22fecc0ca9bb2a61f6ad39bceed1aee38f
Author: Phil Sutter <phil@nwl.cc>
Date:   Tue Apr 28 20:54:03 2020 +0200

    segtree: Fix missing expires value in prefixes

    This probable copy'n'paste bug prevented 'expiration' field from being
    populated when turning a range into a prefix in
    interval_map_decompose(). Consequently, interval sets with timeout did
    print expiry value for ranges (such as 10.0.0.1-10.0.0.5) but not
    prefixes (10.0.0.0/8, for instance).

    Fixes: bb0e6d8a2851b ("segtree: incorrect handling of comments and timeouts with mapping")
    Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 src/segtree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/segtree.c b/src/segtree.c
index e859f84..1ba4363 100644
--- a/src/segtree.c
+++ b/src/segtree.c
@@ -1086,7 +1086,7 @@ void interval_map_decompose(struct expr *set)
 					prefix->comment = xstrdup(low->comment);
 				if (low->timeout)
 					prefix->timeout = low->timeout;
-				if (low->left->expiration)
+				if (low->expiration)
 					prefix->expiration = low->expiration;
 			}
 
-- 
1.8.3.1