tests/shell: typeof_integer/raw: prefer @nh for payload matching

@ih fails on kernels where payload expression doesn't support the 'inner'
base offset.

This test isn't about inner headers, so just use @nh which is
universally available.

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

diff --git a/tests/shell/testcases/maps/dumps/typeof_integer_0.nft b/tests/shell/testcases/maps/dumps/typeof_integer_0.nft
index 330415574c95b594ecef5315b3618721571773dd..19c24febffcc5bd803251db80d7fb655c83b2a31 100644 (file)
--- a/tests/shell/testcases/maps/dumps/typeof_integer_0.nft
+++ b/tests/shell/testcases/maps/dumps/typeof_integer_0.nft
@@ -13,8 +13,8 @@ table inet t {
        }
 
        chain c {
-               udp length . @ih,32,32 vmap @m1
-               udp length . @ih,32,32 vmap @m2
+               udp length . @nh,32,32 vmap @m1
+               udp length . @nh,32,32 vmap @m2
                udp length . @th,160,128 vmap { 47-63 . 0xe373135363130333131303735353203 : accept }
        }
 }

diff --git a/tests/shell/testcases/maps/dumps/typeof_raw_0.nft b/tests/shell/testcases/maps/dumps/typeof_raw_0.nft
index e876425b2bc62581f107a9b0380a4553eba19943..476169f2943b4ce3ea6bf785374b6b56dae18a3c 100644 (file)
--- a/tests/shell/testcases/maps/dumps/typeof_raw_0.nft
+++ b/tests/shell/testcases/maps/dumps/typeof_raw_0.nft
@@ -7,7 +7,7 @@ table ip x {
        }
 
        chain y {
-               ip saddr . @ih,32,32 vmap @y
-               ip saddr . @ih,32,32 vmap { 4.4.4.4 . 0x34 : accept, 5.5.5.5 . 0x45 : drop }
+               ip saddr . @nh,32,32 vmap @y
+               ip saddr . @nh,32,32 vmap { 4.4.4.4 . 0x34 : accept, 5.5.5.5 . 0x45 : drop }
        }
 }

diff --git a/tests/shell/testcases/maps/typeof_integer_0 b/tests/shell/testcases/maps/typeof_integer_0
index d51510af9073350db90f471eac8730119138a135..0deff5eef67b0582475a87de3c30dfb681ae8ad4 100755 (executable)
--- a/tests/shell/testcases/maps/typeof_integer_0
+++ b/tests/shell/testcases/maps/typeof_integer_0
@@ -13,8 +13,8 @@ EXPECTED="table inet t {
        }
 
        chain c {
-               udp length . @ih,32,32 vmap @m1
-               udp length . @ih,32,32 vmap @m2
+               udp length . @nh,32,32 vmap @m1
+               udp length . @nh,32,32 vmap @m2
                udp length . @th,160,128 vmap { 47-63 . 0xe373135363130333131303735353203 : accept }
        }
 }"

diff --git a/tests/shell/testcases/maps/typeof_raw_0 b/tests/shell/testcases/maps/typeof_raw_0
index e3da7825cb7bfd482cd28f3cd24c4d25d90d7180..bcd2c6d8c5024f10c4383917584049dca040bdb6 100755 (executable)
--- a/tests/shell/testcases/maps/typeof_raw_0
+++ b/tests/shell/testcases/maps/typeof_raw_0
@@ -7,8 +7,8 @@ EXPECTED="table ip x {
        }
 
        chain y {
-               ip saddr . @ih,32,32 vmap @y
-               ip saddr . @ih,32,32 vmap { 4.4.4.4 . 0x34 : accept, 5.5.5.5 . 0x45 : drop}
+               ip saddr . @nh,32,32 vmap @y
+               ip saddr . @nh,32,32 vmap { 4.4.4.4 . 0x34 : accept, 5.5.5.5 . 0x45 : drop}
        }
 }"
 

diff --git a/tests/shell/testcases/sets/dumps/typeof_raw_0.nft b/tests/shell/testcases/sets/dumps/typeof_raw_0.nft
index 499ff167f51de3d4b773e651532709cf3961fe8e..4d6abaaa151b690276304bd4422f35480a000806 100644 (file)
--- a/tests/shell/testcases/sets/dumps/typeof_raw_0.nft
+++ b/tests/shell/testcases/sets/dumps/typeof_raw_0.nft
@@ -6,7 +6,7 @@ table inet t {
        }
 
        chain y {
-               ip saddr . @ih,32,32 { 1.1.1.1 . 0x14, 2.2.2.2 . 0x1e }
-               ip daddr . @ih,32,32 @y
+               ip saddr . @nh,32,32 { 1.1.1.1 . 0x14, 2.2.2.2 . 0x1e }
+               ip daddr . @nh,32,32 @y
        }
 }

diff --git a/tests/shell/testcases/sets/typeof_raw_0 b/tests/shell/testcases/sets/typeof_raw_0
index 36396b5c2e1d862434861ff34ec998978af530f5..66042eb4085a99862211be3e530ae0b7716ea221 100755 (executable)
--- a/tests/shell/testcases/sets/typeof_raw_0
+++ b/tests/shell/testcases/sets/typeof_raw_0
@@ -7,8 +7,8 @@ EXPECTED="table inet t {
        }
 
        chain y {
-               ip saddr . @ih,32,32 { 1.1.1.1 . 0x14, 2.2.2.2 . 0x1e }
-               ip daddr . @ih,32,32 @y
+               ip saddr . @nh,32,32 { 1.1.1.1 . 0x14, 2.2.2.2 . 0x1e }
+               ip daddr . @nh,32,32 @y
        }
 }"