diff options
author | Phil Sutter <phil@nwl.cc> | 2018-01-10 21:32:04 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-01-11 13:20:38 +0100 |
commit | 9a4b513014cfdeaad6d247b72a7924b3a536cfe9 (patch) | |
tree | 4bf67caa47b85400ec036a2562e17f439c3007e4 /tests/shell/testcases/sets | |
parent | 0b3ccd27e12d1df442aa3eac40a2ccb63d6c6407 (diff) |
src: Don't merge adjacent/overlapping ranges
Previously, when adding multiple ranges to a set they were merged if
overlapping or adjacent. This might cause inconvenience though since it
is afterwards not easily possible anymore to remove one of the merged
ranges again while keeping the others in place.
Since it is not possible to have overlapping ranges, this patch adds a
check for newly added ranges to make sure they don't overlap if merging
is turned off.
Note that it is not possible (yet?) to enable range merging using nft
tool.
Testsuite had to be adjusted as well: One test in tests/py changed avoid
adding overlapping ranges and the test in tests/shell which explicitly
tests for this feature dropped.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/shell/testcases/sets')
-rwxr-xr-x | tests/shell/testcases/sets/0002named_interval_automerging_0 | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/shell/testcases/sets/0002named_interval_automerging_0 b/tests/shell/testcases/sets/0002named_interval_automerging_0 deleted file mode 100755 index b07e0b09..00000000 --- a/tests/shell/testcases/sets/0002named_interval_automerging_0 +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# This testscase checks the automerging of adjacent intervals - -set -e - -$NFT add table t -$NFT add set t s { type ipv4_addr \; flags interval \; } -$NFT add element t s { 192.168.0.0/24, 192.168.1.0/24 } -$NFT list ruleset | grep "192.168.0.0/23" >/dev/null && exit 0 -echo "E: automerging of adjavect intervals failed in named set" >&2 -exit 1 |