summaryrefslogtreecommitdiffstats
path: root/tests/py/bridge
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2017-03-22 16:38:30 +0100
committerFlorian Westphal <fw@strlen.de>2017-05-19 09:41:22 +0200
commit81d78c6e73d49dabae9414a9fda4efcb5fa7e224 (patch)
treeb1e395a931f6dd99522194de6bec2dc2e14b6ed6 /tests/py/bridge
parentf21a7a4849b50c30341ec571813bd7fe37040ad3 (diff)
tests: fix up meta l4proto change for ip6 family
After previous commit nft generates meta l4proto for ipv6 dependencies instead of checking the (first) nexthdr value. This fixes up all tests cases accordingly except one which fails with ip6/reject.t: ... 12: 'ip6 nexthdr 6 reject with tcp reset' mismatches 'meta l4proto 6 reject with tcp reset' This will be fixed by removing the implicit dependency in a followup patch. Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/py/bridge')
-rw-r--r--tests/py/bridge/icmpX.t2
-rw-r--r--tests/py/bridge/icmpX.t.payload2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/py/bridge/icmpX.t b/tests/py/bridge/icmpX.t
index 8c0a5979..5c76c0f7 100644
--- a/tests/py/bridge/icmpX.t
+++ b/tests/py/bridge/icmpX.t
@@ -5,4 +5,4 @@
ip protocol icmp icmp type echo-request;ok;icmp type echo-request
icmp type echo-request;ok
ip6 nexthdr icmpv6 icmpv6 type echo-request;ok;icmpv6 type echo-request
-icmpv6 type echo-request;ok
+icmpv6 type echo-request;ok;ether type ip6 meta l4proto 58 icmpv6 type echo-request
diff --git a/tests/py/bridge/icmpX.t.payload b/tests/py/bridge/icmpX.t.payload
index 19efdd85..548cdaa5 100644
--- a/tests/py/bridge/icmpX.t.payload
+++ b/tests/py/bridge/icmpX.t.payload
@@ -29,7 +29,7 @@ bridge test-bridge input
bridge test-bridge input
[ payload load 2b @ link header + 12 => reg 1 ]
[ cmp eq reg 1 0x0000dd86 ]
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000080 ]