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/py/any | |
| 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/py/any')
| -rw-r--r-- | tests/py/any/meta.t | 2 | ||||
| -rw-r--r-- | tests/py/any/meta.t.payload | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t index a38c5011..3158e887 100644 --- a/tests/py/any/meta.t +++ b/tests/py/any/meta.t @@ -15,7 +15,7 @@ meta length 33-45;ok meta length != 33-45;ok meta length { 33, 55, 67, 88};ok meta length { 33-55, 67-88};ok -meta length { 33-55, 55-88, 100-120};ok;meta length { 33-88, 100-120} +meta length { 33-55, 56-88, 100-120};ok;meta length { 33-55, 56-88, 100-120} meta length != { 33, 55, 67, 88};ok meta length { 33-55};ok meta length != { 33-55};ok diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload index b2065f3d..d0199b8a 100644 --- a/tests/py/any/meta.t.payload +++ b/tests/py/any/meta.t.payload @@ -52,10 +52,10 @@ ip test-ip4 input [ byteorder reg 1 = hton(reg 1, 4, 4) ] [ lookup reg 1 set __set%d ] -# meta length { 33-55, 55-88, 100-120} +# meta length { 33-55, 56-88, 100-120} __set%d test-ip4 7 __set%d test-ip4 0 - element 00000000 : 1 [end] element 21000000 : 0 [end] element 59000000 : 1 [end] element 64000000 : 0 [end] element 79000000 : 1 [end] + element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 0 [end] element 59000000 : 1 [end] element 64000000 : 0 [end] element 79000000 : 1 [end] ip test-ip4 input [ meta load len => reg 1 ] [ byteorder reg 1 = hton(reg 1, 4, 4) ] |