From b90b2482aa026ffbc9105348098094c4b09c1dc4 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Fri, 1 Sep 2023 14:05:05 +0200 Subject: 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 --- tests/shell/testcases/maps/dumps/typeof_integer_0.nft | 4 ++-- tests/shell/testcases/maps/dumps/typeof_raw_0.nft | 4 ++-- tests/shell/testcases/maps/typeof_integer_0 | 4 ++-- tests/shell/testcases/maps/typeof_raw_0 | 4 ++-- tests/shell/testcases/sets/dumps/typeof_raw_0.nft | 4 ++-- tests/shell/testcases/sets/typeof_raw_0 | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/shell/testcases/maps/dumps/typeof_integer_0.nft b/tests/shell/testcases/maps/dumps/typeof_integer_0.nft index 33041557..19c24feb 100644 --- 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 e876425b..476169f2 100644 --- 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 d51510af..0deff5ee 100755 --- 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 e3da7825..bcd2c6d8 100755 --- 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 499ff167..4d6abaaa 100644 --- 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 36396b5c..66042eb4 100755 --- 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 } }" -- cgit v1.2.3