tests: frag: enable more tests

a couple of tests were disabled since nft did not support this.

Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/tests/py/ip6/frag.t b/tests/py/ip6/frag.t
index 1551044d3f58afad15ff8e187bfbdb5879dbc147..d68fd064c4c3f7135fbf489e20f134f697d57218 100644 (file)
--- a/tests/py/ip6/frag.t
+++ b/tests/py/ip6/frag.t
@@ -25,8 +25,8 @@ frag reserved { 33-55};ok
 
 frag frag-off 22;ok
 frag frag-off != 233;ok
-- frag frag-off 33-45;ok
-- frag frag-off != 33-45;ok
+frag frag-off 33-45;ok
+frag frag-off != 33-45;ok
 frag frag-off { 33, 55, 67, 88};ok
 - frag frag-off != { 33, 55, 67, 88};ok
 frag frag-off { 33-55};ok
@@ -43,7 +43,7 @@ frag frag-off { 33-55};ok
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 # BUG more-fragments 1 and frag more-fragments 4
-# frag more-fragments 1
+frag more-fragments 1;ok
 # <cmdline>:1:1-44: Error: Could not process rule: Invalid argument
 # add rule ip test input frag more-fragments 1
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/tests/py/ip6/frag.t.payload.inet b/tests/py/ip6/frag.t.payload.inet
index e04d128e1e675ec05a9e49de81591fb7ae83c1f0..52eaafff3953823d45c5ff743ff6e07afb3e7ba9 100644 (file)
--- a/tests/py/ip6/frag.t.payload.inet
+++ b/tests/py/ip6/frag.t.payload.inet
@@ -102,6 +102,24 @@ inet test-inet output
   [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00004807 ]
 
+# frag frag-off 33-45
+inet test-inet output
+  [ meta load nfproto => reg 1 ]
+  [ cmp eq reg 1 0x0000000a ]
+  [ exthdr load 2b @ 44 + 2 => reg 1 ]
+  [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
+  [ cmp gte reg 1 0x00000801 ]
+  [ cmp lte reg 1 0x00006801 ]
+
+# frag frag-off != 33-45
+inet test-inet output
+  [ meta load nfproto => reg 1 ]
+  [ cmp eq reg 1 0x0000000a ]
+  [ exthdr load 2b @ 44 + 2 => reg 1 ]
+  [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
+  [ cmp lt reg 1 0x00000801 ]
+  [ cmp gt reg 1 0x00006801 ]
+
 # frag frag-off { 33, 55, 67, 88}
 set%d test-inet 3
 set%d test-inet 0
@@ -124,6 +142,14 @@ inet test-inet output
   [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
   [ lookup reg 1 set set%d ]
 
+# frag more-fragments 1
+inet test-inet output
+  [ meta load nfproto => reg 1 ]
+  [ cmp eq reg 1 0x0000000a ]
+  [ exthdr load 1b @ 44 + 3 => reg 1 ]
+  [ bitwise reg 1 = (reg=1 & 0x00000001 ) ^ 0x00000000 ]
+  [ cmp eq reg 1 0x00000001 ]
+
 # frag id 1
 inet test-inet output
   [ meta load nfproto => reg 1 ]

diff --git a/tests/py/ip6/frag.t.payload.ip6 b/tests/py/ip6/frag.t.payload.ip6
index b3da6fefa43cc023615ca2ca5b775e09d59349e5..a2adaaebc07336abbcb0b63d1d845e94b2b96e1e 100644 (file)
--- a/tests/py/ip6/frag.t.payload.ip6
+++ b/tests/py/ip6/frag.t.payload.ip6
@@ -76,6 +76,20 @@ ip6 test-ip6 output
   [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
   [ cmp neq reg 1 0x00004807 ]
 
+# frag frag-off 33-45
+ip6 test-ip6 output
+  [ exthdr load 2b @ 44 + 2 => reg 1 ]
+  [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
+  [ cmp gte reg 1 0x00000801 ]
+  [ cmp lte reg 1 0x00006801 ]
+
+# frag frag-off != 33-45
+ip6 test-ip6 output
+  [ exthdr load 2b @ 44 + 2 => reg 1 ]
+  [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
+  [ cmp lt reg 1 0x00000801 ]
+  [ cmp gt reg 1 0x00006801 ]
+
 # frag frag-off { 33, 55, 67, 88}
 set%d test-ip6 3
 set%d test-ip6 0
@@ -94,6 +108,12 @@ ip6 test-ip6 output
   [ bitwise reg 1 = (reg=1 & 0x0000f8ff ) ^ 0x00000000 ]
   [ lookup reg 1 set set%d ]
 
+# frag more-fragments 1
+ip6 test-ip6 output
+  [ exthdr load 1b @ 44 + 3 => reg 1 ]
+  [ bitwise reg 1 = (reg=1 & 0x00000001 ) ^ 0x00000000 ]
+  [ cmp eq reg 1 0x00000001 ]
+
 # frag id 1
 ip6 test-ip6 output
   [ exthdr load 4b @ 44 + 4 => reg 1 ]