From 9a1f2bbf3cd2417e0c10d18578e224abe2071d68 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Tue, 21 Mar 2017 19:47:22 +0100 Subject: 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 :1:50-60: Error: conflicting protocols specified: unknown vs. icmpv6 add icmpv6 to nexthdr list so base gets updated correctly. Reported-by: Thomas Woerner Signed-off-by: Florian Westphal --- tests/py/any/meta.t | 1 + tests/py/any/meta.t.payload | 7 +++++++ 2 files changed, 8 insertions(+) (limited to 'tests') 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 ] -- cgit v1.2.3