From: Phil Sutter Date: Tue, 28 Apr 2020 18:54:03 +0000 (+0200) Subject: segtree: Fix missing expires value in prefixes X-Git-Tag: v0.9.5~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60ba9c22fecc0ca9bb2a61f6ad39bceed1aee38f;p=thirdparty%2Fnftables.git 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 --- diff --git a/src/segtree.c b/src/segtree.c index a9d6ecc8..002ee41a 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -1099,7 +1099,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; }