summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2017-03-21 19:47:22 +0100
committerFlorian Westphal <fw@strlen.de>2017-05-19 09:41:22 +0200
commit9a1f2bbf3cd2417e0c10d18578e224abe2071d68 (patch)
tree0ae0665175cc89efbd847a5e6f28113a59245d59 /tests
parent8d8cfe5ad6ca460a5262fb15fdbef3601058c784 (diff)
src: allow update of net base w. meta l4proto icmpv6
nft add rule ip6 f i meta l4proto ipv6-icmp icmpv6 type nd-router-advert <cmdline>:1:50-60: Error: conflicting protocols specified: unknown vs. icmpv6 add icmpv6 to nexthdr list so base gets updated correctly. Reported-by: Thomas Woerner <twoerner@redhat.com> Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests')
-rw-r--r--tests/py/any/meta.t1
-rw-r--r--tests/py/any/meta.t.payload7
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t
index c3ac0a4c..2ff942ff 100644
--- a/tests/py/any/meta.t
+++ b/tests/py/any/meta.t
@@ -38,6 +38,7 @@ meta l4proto { 33, 55, 67, 88};ok;meta l4proto { 33, 55, 67, 88}
meta l4proto != { 33, 55, 67, 88};ok
meta l4proto { 33-55};ok
meta l4proto != { 33-55};ok
+meta l4proto ipv6-icmp icmpv6 type nd-router-advert;ok;icmpv6 type nd-router-advert
meta priority root;ok
meta priority none;ok
diff --git a/tests/py/any/meta.t.payload b/tests/py/any/meta.t.payload
index e4326566..871f1ada 100644
--- a/tests/py/any/meta.t.payload
+++ b/tests/py/any/meta.t.payload
@@ -187,6 +187,13 @@ ip test-ip4 input
[ byteorder reg 1 = hton(reg 1, 2, 1) ]
[ lookup reg 1 set __set%d 0x1 ]
+# meta l4proto ipv6-icmp icmpv6 type nd-router-advert
+ip test-ip4 input
+ [ meta load l4proto => reg 1 ]
+ [ cmp eq reg 1 0x0000003a ]
+ [ payload load 1b @ transport header + 0 => reg 1 ]
+ [ cmp eq reg 1 0x00000086 ]
+
# meta mark 0x4
ip test-ip4 input
[ meta load mark => reg 1 ]