]> git.ipfire.org Git - thirdparty/nftables.git/commit
monitor: Fix output for ranges in anonymous sets
authorPhil Sutter <phil@nwl.cc>
Mon, 13 Jan 2020 13:53:24 +0000 (14:53 +0100)
committerPhil Sutter <phil@nwl.cc>
Mon, 13 Jan 2020 15:55:37 +0000 (16:55 +0100)
commitddbacd70d061eb1b6808f501969809bfb5d03001
treebab9f7925906890439edf1bc8329b429d7080954
parenteb5034108cdc60341b2d61599077db935b6bbc4f
monitor: Fix output for ranges in anonymous sets

Previous fix for named interval sets was simply wrong: Instead of
limiting decomposing to anonymous interval sets, it effectively disabled
it entirely.

Since code needs to check for both interval and anonymous bits
separately, introduce set_is_interval() helper to keep the code
readable.

Also extend test case to assert ranges in anonymous sets are correctly
printed by echo or monitor modes. Without this fix, range boundaries are
printed as individual set elements.

Fixes: 5d57fa3e99bb9 ("monitor: Do not decompose non-anonymous sets")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Reviewed-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/rule.h
src/monitor.c
tests/monitor/testcases/set-interval.t