diff options
author | Florian Westphal <fw@strlen.de> | 2018-03-28 10:38:06 +0200 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2018-03-28 11:24:23 +0200 |
commit | 1e173590ef999f110f90112573f5c590088165b0 (patch) | |
tree | 407c9628114593fc8599d7e3c4cecad3814079a6 /tests/py/ip6 | |
parent | 126706c23c0458b07d54550dc27561b30f8a43f2 (diff) |
proto: permit icmp-in-ipv6 and icmpv6-in-ipv4
Jozsef points out that
meta l4proto icmp icmp type destination-unreachable
is hard to read. So, lets just add icmp/icmpv6 to
ip/ip6 protocol base so users can just go with
icmp type destination-unreachable
and let nft fill in needed dependency.
After this patch, the recent patch to not remove the
dependency can be reverted again.
Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/py/ip6')
-rw-r--r-- | tests/py/ip6/meta.t | 7 | ||||
-rw-r--r-- | tests/py/ip6/meta.t.payload | 34 |
2 files changed, 37 insertions, 4 deletions
diff --git a/tests/py/ip6/meta.t b/tests/py/ip6/meta.t index 68fa89f5..24445084 100644 --- a/tests/py/ip6/meta.t +++ b/tests/py/ip6/meta.t @@ -5,7 +5,6 @@ icmpv6 type nd-router-advert;ok meta l4proto ipv6-icmp icmpv6 type nd-router-advert;ok;icmpv6 type nd-router-advert -meta l4proto icmp icmp type echo-request;ok;meta l4proto 1 icmp type echo-request -meta l4proto 1 icmp type echo-request;ok - -icmp type echo-request;fail +meta l4proto icmp icmp type echo-request;ok;icmp type echo-request +meta l4proto 1 icmp type echo-request;ok;icmp type echo-request +icmp type echo-request;ok diff --git a/tests/py/ip6/meta.t.payload b/tests/py/ip6/meta.t.payload new file mode 100644 index 00000000..f203baab --- /dev/null +++ b/tests/py/ip6/meta.t.payload @@ -0,0 +1,34 @@ +# 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 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 l4proto icmp icmp type echo-request +ip6 test-ip6 input + [ meta load l4proto => reg 1 ] + [ cmp eq reg 1 0x00000001 ] + [ payload load 1b @ transport header + 0 => reg 1 ] + [ cmp eq reg 1 0x00000008 ] + +# meta l4proto 1 icmp type echo-request +ip6 test-ip6 input + [ meta load l4proto => reg 1 ] + [ cmp eq reg 1 0x00000001 ] + [ payload load 1b @ transport header + 0 => reg 1 ] + [ cmp eq reg 1 0x00000008 ] + +# icmp type echo-request +ip6 test-ip6 input + [ meta load l4proto => reg 1 ] + [ cmp eq reg 1 0x00000001 ] + [ payload load 1b @ transport header + 0 => reg 1 ] + [ cmp eq reg 1 0x00000008 ] |