diff options
| author | Phil Sutter <phil@nwl.cc> | 2020-01-13 14:53:24 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2020-01-13 16:55:37 +0100 |
| commit | ddbacd70d061eb1b6808f501969809bfb5d03001 (patch) | |
| tree | bab9f7925906890439edf1bc8329b429d7080954 /tests/monitor | |
| parent | eb5034108cdc60341b2d61599077db935b6bbc4f (diff) | |
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>
Diffstat (limited to 'tests/monitor')
| -rw-r--r-- | tests/monitor/testcases/set-interval.t | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/monitor/testcases/set-interval.t b/tests/monitor/testcases/set-interval.t index 59930c58..1fbcfe22 100644 --- a/tests/monitor/testcases/set-interval.t +++ b/tests/monitor/testcases/set-interval.t @@ -18,3 +18,8 @@ J {"add": {"element": {"family": "ip", "table": "t", "name": "s", "elem": {"set" I add rule ip t c tcp dport @s O - J {"add": {"rule": {"family": "ip", "table": "t", "chain": "c", "handle": 0, "expr": [{"match": {"op": "==", "left": {"payload": {"protocol": "tcp", "field": "dport"}}, "right": "@s"}}]}}} + +# test anonymous interval sets as well +I add rule ip t c tcp dport { 20, 30-40 } +O - +J {"add": {"rule": {"family": "ip", "table": "t", "chain": "c", "handle": 0, "expr": [{"match": {"op": "==", "left": {"payload": {"protocol": "tcp", "field": "dport"}}, "right": {"set": [20, {"range": [30, 40]}]}}}]}}} |