* [PATCH nft 00/10] switch l4 dependency to meta l4proto
@ 2017-05-09 15:51 Florian Westphal
2017-05-09 15:51 ` [PATCH nft 01/10] src: allow update of net base w. meta l4proto icmpv6 Florian Westphal
` (9 more replies)
0 siblings, 10 replies; 23+ messages in thread
From: Florian Westphal @ 2017-05-09 15:51 UTC (permalink / raw)
To: netfilter-devel
Currently nft inserts different types of dependencies for l4 protocols,
depending on the family.
For inet, nft inserts 'meta l4proto' to e.g. check for tcp.
For ip, nft uses 'ip protocol' instead.
For ipv6, 'ip6 nexthdr' is used.
And the latter is a problem, because this means that
'tcp dport 22' will only match tcp packets that do not have a ipv6 extension
header.
This first switches implicit ipv6 dependency to 'meta l4proto', so
the last transport header protocol will be considered instead of the
first ipv6 nexthdr value.
For ip, this problem doesn't exist, however, since it makes things
a bit simpler when nft creates the same l4 dependency for ip/ip6/inet/bridge
and so on the later patches in this series will also switch ipv4 over to
meta expression.
src/evaluate.c | 8 ++++++++
src/netlink_delinearize.c | 6 ++++++
src/payload.c | 24 +++++++++++++++++++++++-
src/proto.c | 6 ++++--
4 files changed, 41 insertions(+), 3 deletions(-)
[ diffstat exludes test/ intentionally.
Also, last patch uses -C mode to avoid a huge 7000 line diff. ]
^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH nft 01/10] src: allow update of net base w. meta l4proto icmpv6
2017-05-09 15:51 [PATCH nft 00/10] switch l4 dependency to meta l4proto Florian Westphal
@ 2017-05-09 15:51 ` Florian Westphal
2017-05-16 10:04 ` Pablo Neira Ayuso
2017-05-09 15:51 ` [PATCH nft 02/10] src: ipv6: switch implicit dependencies to meta l4proto Florian Westphal
` (8 subsequent siblings)
9 siblings, 1 reply; 23+ messages in thread
From: Florian Westphal @ 2017-05-09 15:51 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
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>
---
src/proto.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/proto.c b/src/proto.c
index 79e9dbf2b33e..fcdfbe73c735 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -779,6 +779,7 @@ const struct proto_desc proto_inet_service = {
PROTO_LINK(IPPROTO_TCP, &proto_tcp),
PROTO_LINK(IPPROTO_DCCP, &proto_dccp),
PROTO_LINK(IPPROTO_SCTP, &proto_sctp),
+ PROTO_LINK(IPPROTO_ICMPV6, &proto_icmp6),
},
.templates = {
[0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8),
--
2.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH nft 02/10] src: ipv6: switch implicit dependencies to meta l4proto
2017-05-09 15:51 [PATCH nft 00/10] switch l4 dependency to meta l4proto Florian Westphal
2017-05-09 15:51 ` [PATCH nft 01/10] src: allow update of net base w. meta l4proto icmpv6 Florian Westphal
@ 2017-05-09 15:51 ` Florian Westphal
2017-05-16 10:05 ` Pablo Neira Ayuso
2017-05-09 15:51 ` [PATCH nft 03/10] src: treat ip6 nexthdr as a protocol Florian Westphal
` (7 subsequent siblings)
9 siblings, 1 reply; 23+ messages in thread
From: Florian Westphal @ 2017-05-09 15:51 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
when using rule like
ip6 filter input tcp dport 22
nft generates:
[ payload load 1b @ network header + 6 => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
which is: ip6 filter input ip6 nexthdr tcp dport 22
IOW, such a rule won't match if e.g. a fragment header is in place.
This changes ip6_proto to use 'meta l4proto' which is the protocol header
found by exthdr walk.
A side effect is that for bridge we get a shorter dependency chain as it
no longer needs to prepend 'ether proto ipv6' for old 'ip6 nexthdr' dep.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
src/proto.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/proto.c b/src/proto.c
index fcdfbe73c735..3b20a5fd35b1 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -707,7 +707,6 @@ const struct proto_desc proto_icmp6 = {
const struct proto_desc proto_ip6 = {
.name = "ip6",
.base = PROTO_BASE_NETWORK_HDR,
- .protocol_key = IP6HDR_NEXTHDR,
.protocols = {
PROTO_LINK(IPPROTO_ESP, &proto_esp),
PROTO_LINK(IPPROTO_AH, &proto_ah),
@@ -720,6 +719,7 @@ const struct proto_desc proto_ip6 = {
PROTO_LINK(IPPROTO_ICMPV6, &proto_icmp6),
},
.templates = {
+ [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8),
[IP6HDR_VERSION] = HDR_BITFIELD("version", &integer_type, 0, 4),
[IP6HDR_DSCP] = HDR_BITFIELD("dscp", &dscp_type, 4, 6),
[IP6HDR_ECN] = HDR_BITFIELD("ecn", &ecn_type, 10, 2),
--
2.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH nft 03/10] src: treat ip6 nexthdr as a protocol
2017-05-09 15:51 [PATCH nft 00/10] switch l4 dependency to meta l4proto Florian Westphal
2017-05-09 15:51 ` [PATCH nft 01/10] src: allow update of net base w. meta l4proto icmpv6 Florian Westphal
2017-05-09 15:51 ` [PATCH nft 02/10] src: ipv6: switch implicit dependencies to meta l4proto Florian Westphal
@ 2017-05-09 15:51 ` Florian Westphal
2017-05-16 10:28 ` Pablo Neira Ayuso
2017-05-09 15:51 ` [PATCH nft 04/10] tests: fix up meta l4proto change for ip6 family Florian Westphal
` (6 subsequent siblings)
9 siblings, 1 reply; 23+ messages in thread
From: Florian Westphal @ 2017-05-09 15:51 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
ip6 nexthdr tcp tcp dport 22
will now inject a (useless) meta l4 dependency as ip6 nexthdr is no
longer flagged as EXPR_F_PROTOCOL.
Avoid this if user really specified a test for ip6hdr->nexthdr.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
src/payload.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/payload.c b/src/payload.c
index 55128fee1498..3a3fe8de97cf 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -117,6 +117,23 @@ static const struct expr_ops payload_expr_ops = {
.pctx_update = payload_expr_pctx_update,
};
+/*
+ * ipv6 is special case, we normally use 'meta l4proto' to fetch the last
+ * l4 header of the ipv6 extension header chain so we will also match
+ * tcp after a fragmentation header, for instance.
+ *
+ * If user specifically asks for nexthdr x, treat is as a full
+ * dependency rather than injecting another (useless) meta l4 one.
+ */
+static bool proto_key_is_protocol(const struct proto_desc *desc, unsigned int type)
+{
+ if (type == desc->protocol_key ||
+ (desc == &proto_ip6 && type == IP6HDR_NEXTHDR))
+ return true;
+
+ return false;
+}
+
struct expr *payload_expr_alloc(const struct location *loc,
const struct proto_desc *desc,
unsigned int type)
@@ -129,7 +146,7 @@ struct expr *payload_expr_alloc(const struct location *loc,
if (desc != NULL) {
tmpl = &desc->templates[type];
base = desc->base;
- if (type == desc->protocol_key)
+ if (proto_key_is_protocol(desc, type))
flags = EXPR_F_PROTOCOL;
} else {
tmpl = &proto_unknown_template;
--
2.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH nft 04/10] tests: fix up meta l4proto change for ip6 family
2017-05-09 15:51 [PATCH nft 00/10] switch l4 dependency to meta l4proto Florian Westphal
` (2 preceding siblings ...)
2017-05-09 15:51 ` [PATCH nft 03/10] src: treat ip6 nexthdr as a protocol Florian Westphal
@ 2017-05-09 15:51 ` Florian Westphal
2017-05-16 10:22 ` Pablo Neira Ayuso
2017-05-09 15:51 ` [PATCH nft 05/10] tests: meta: add icmpv6 test case Florian Westphal
` (5 subsequent siblings)
9 siblings, 1 reply; 23+ messages in thread
From: Florian Westphal @ 2017-05-09 15:51 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
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>
---
tests/py/bridge/icmpX.t.payload | 4 +-
tests/py/inet/ah.t.payload.ip6 | 60 +++++++-------
tests/py/inet/comp.t.payload.ip6 | 34 ++++----
tests/py/inet/dccp.t.payload.ip6 | 36 ++++----
tests/py/inet/esp.t.payload.ip6 | 30 +++----
tests/py/inet/ether.t.payload.ip6 | 6 +-
tests/py/inet/icmpX.t.payload | 4 +-
tests/py/inet/sctp.t.payload.ip6 | 64 +++++++-------
tests/py/inet/tcp.t.payload.ip6 | 152 +++++++++++++++++-----------------
tests/py/inet/udp.t.payload.ip6 | 72 ++++++++--------
tests/py/inet/udplite.t.payload.ip6 | 52 ++++++------
tests/py/ip6/dnat.t.payload.ip6 | 6 +-
tests/py/ip6/ether.t.payload | 6 +-
tests/py/ip6/icmpv6.t.payload.ip6 | 132 ++++++++++++++---------------
tests/py/ip6/masquerade.t.payload.ip6 | 28 +++----
tests/py/ip6/redirect.t.payload.ip6 | 38 ++++-----
tests/py/ip6/reject.t.payload.ip6 | 2 +-
tests/py/ip6/snat.t.payload.ip6 | 4 +-
tests/py/ip6/tcpopt.t.payload | 52 ++++++------
19 files changed, 389 insertions(+), 393 deletions(-)
diff --git a/tests/py/bridge/icmpX.t.payload b/tests/py/bridge/icmpX.t.payload
index 19efdd85c43b..b351f7b008b7 100644
--- a/tests/py/bridge/icmpX.t.payload
+++ b/tests/py/bridge/icmpX.t.payload
@@ -27,9 +27,7 @@ bridge test-bridge input
# icmpv6 type echo-request
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 ]
diff --git a/tests/py/inet/ah.t.payload.ip6 b/tests/py/inet/ah.t.payload.ip6
index f12f0a0dd2c2..4d5df6368da4 100644
--- a/tests/py/inet/ah.t.payload.ip6
+++ b/tests/py/inet/ah.t.payload.ip6
@@ -1,6 +1,6 @@
# ah hdrlength 11-23
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ cmp gte reg 1 0x0000000b ]
@@ -8,7 +8,7 @@ ip6 test-ip6 input
# ah hdrlength != 11-23
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ range neq reg 1 0x0000000b 0x00000017 ]
@@ -18,7 +18,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 0000000b : 0 [end] element 00000018 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -28,7 +28,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 0000000b : 0 [end] element 00000018 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -38,7 +38,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 0000000b : 0 [end] element 00000017 : 0 [end] element 0000002c : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -48,28 +48,28 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 0000000b : 0 [end] element 00000017 : 0 [end] element 0000002c : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# ah reserved 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# ah reserved != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# ah reserved 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -77,7 +77,7 @@ ip6 test-ip6 input
# ah reserved != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -87,7 +87,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00001700 : 0 [end] element 00006400 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -97,7 +97,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00001700 : 0 [end] element 00006400 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -107,7 +107,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -117,28 +117,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# ah spi 111
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp eq reg 1 0x6f000000 ]
# ah spi != 111
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp neq reg 1 0x6f000000 ]
# ah spi 111-222
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp gte reg 1 0x6f000000 ]
@@ -146,7 +146,7 @@ ip6 test-ip6 input
# ah spi != 111-222
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ range neq reg 1 0x6f000000 0xde000000 ]
@@ -156,7 +156,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 6f000000 : 0 [end] element 7a000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -166,7 +166,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 6f000000 : 0 [end] element 7a000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -176,7 +176,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 6f000000 : 0 [end] element 7b000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -186,21 +186,21 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 6f000000 : 0 [end] element 7b000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# ah sequence 123
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ cmp eq reg 1 0x7b000000 ]
# ah sequence != 123
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ cmp neq reg 1 0x7b000000 ]
@@ -210,7 +210,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 17000000 : 0 [end] element 19000000 : 0 [end] element 21000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -220,7 +220,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 17000000 : 0 [end] element 19000000 : 0 [end] element 21000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -230,7 +230,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 17000000 : 0 [end] element 22000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -240,14 +240,14 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 17000000 : 0 [end] element 22000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# ah sequence 23-33
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ cmp gte reg 1 0x17000000 ]
@@ -255,7 +255,7 @@ ip6 test-ip6 input
# ah sequence != 23-33
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000033 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ range neq reg 1 0x17000000 0x21000000 ]
diff --git a/tests/py/inet/comp.t.payload.ip6 b/tests/py/inet/comp.t.payload.ip6
index a325d8cdc9ad..3048d822d3f7 100644
--- a/tests/py/inet/comp.t.payload.ip6
+++ b/tests/py/inet/comp.t.payload.ip6
@@ -1,27 +1,27 @@
# comp nexthdr != esp
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp neq reg 1 0x00000032 ]
# comp flags 0x0
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ cmp eq reg 1 0x00000000 ]
# comp flags != 0x23
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ cmp neq reg 1 0x00000023 ]
# comp flags 0x33-0x45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ cmp gte reg 1 0x00000033 ]
@@ -29,7 +29,7 @@ ip6 test-ip6 input
# comp flags != 0x33-0x45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ range neq reg 1 0x00000033 0x00000045 ]
@@ -39,7 +39,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000033 : 0 [end] element 00000055 : 0 [end] element 00000067 : 0 [end] element 00000088 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -49,7 +49,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000033 : 0 [end] element 00000055 : 0 [end] element 00000067 : 0 [end] element 00000088 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -59,7 +59,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000033 : 0 [end] element 00000056 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -69,28 +69,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000033 : 0 [end] element 00000056 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# comp cpi 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# comp cpi != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# comp cpi 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -98,7 +98,7 @@ ip6 test-ip6 input
# comp cpi != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -108,7 +108,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -118,7 +118,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -128,7 +128,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -138,7 +138,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000006c ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
diff --git a/tests/py/inet/dccp.t.payload.ip6 b/tests/py/inet/dccp.t.payload.ip6
index 0f8aab11d69d..0fa441043a7a 100644
--- a/tests/py/inet/dccp.t.payload.ip6
+++ b/tests/py/inet/dccp.t.payload.ip6
@@ -1,6 +1,6 @@
# dccp sport 21-35
ip test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp gte reg 1 0x00001500 ]
@@ -8,7 +8,7 @@ ip test-ip6 input
# dccp sport != 21-35
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ range neq reg 1 0x00001500 0x00002300 ]
@@ -18,7 +18,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -28,7 +28,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -38,7 +38,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00001400 : 0 [end] element 00003300 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -48,14 +48,14 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00001400 : 0 [end] element 00003300 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# dccp sport ftp-data - re-mail-ck
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp gte reg 1 0x00001400 ]
@@ -63,7 +63,7 @@ ip6 test-ip6 input
# dccp sport 20-50
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp gte reg 1 0x00001400 ]
@@ -74,7 +74,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00001400 : 0 [end] element 00003300 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -84,7 +84,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00001400 : 0 [end] element 00003300 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -94,7 +94,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -104,7 +104,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -114,7 +114,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00001400 : 0 [end] element 00003300 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -124,7 +124,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00001400 : 0 [end] element 00003300 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -134,7 +134,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000000 : 0 [end] element 00000002 : 0 [end] element 00000004 : 0 [end] element 00000006 : 0 [end] element 00000008 : 0 [end] element 0000000a : 0 [end] element 0000000c : 0 [end] element 0000000e : 0 [end] element 00000010 : 0 [end] element 00000012 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 1b @ transport header + 8 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000001e ) ^ 0x00000000 ]
@@ -145,7 +145,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000000 : 0 [end] element 00000002 : 0 [end] element 00000004 : 0 [end] element 00000006 : 0 [end] element 00000008 : 0 [end] element 0000000a : 0 [end] element 0000000c : 0 [end] element 0000000e : 0 [end] element 00000010 : 0 [end] element 00000012 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 1b @ transport header + 8 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000001e ) ^ 0x00000000 ]
@@ -153,7 +153,7 @@ ip6 test-ip6 input
# dccp type request
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 1b @ transport header + 8 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000001e ) ^ 0x00000000 ]
@@ -161,7 +161,7 @@ ip6 test-ip6 input
# dccp type != request
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000021 ]
[ payload load 1b @ transport header + 8 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000001e ) ^ 0x00000000 ]
diff --git a/tests/py/inet/esp.t.payload.ip6 b/tests/py/inet/esp.t.payload.ip6
index 47584921af09..a9ed233c8f5d 100644
--- a/tests/py/inet/esp.t.payload.ip6
+++ b/tests/py/inet/esp.t.payload.ip6
@@ -1,20 +1,20 @@
# esp spi 100
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x64000000 ]
# esp spi != 100
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 0 => reg 1 ]
[ cmp neq reg 1 0x64000000 ]
# esp spi 111-222
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 0 => reg 1 ]
[ cmp gte reg 1 0x6f000000 ]
@@ -22,7 +22,7 @@ ip6 test-ip6 input
# esp spi != 111-222
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 0 => reg 1 ]
[ range neq reg 1 0x6f000000 0xde000000 ]
@@ -32,7 +32,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 64000000 : 0 [end] element 66000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -42,7 +42,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 64000000 : 0 [end] element 66000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -52,7 +52,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 64000000 : 0 [end] element 67000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -62,21 +62,21 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 64000000 : 0 [end] element 67000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# esp sequence 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp eq reg 1 0x16000000 ]
# esp sequence 22-24
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp gte reg 1 0x16000000 ]
@@ -84,7 +84,7 @@ ip6 test-ip6 input
# esp sequence != 22-24
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ range neq reg 1 0x16000000 0x18000000 ]
@@ -94,7 +94,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 16000000 : 0 [end] element 18000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -104,7 +104,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 16000000 : 0 [end] element 18000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -114,7 +114,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 16000000 : 0 [end] element 1a000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -124,7 +124,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 16000000 : 0 [end] element 1a000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000032 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
diff --git a/tests/py/inet/ether.t.payload.ip6 b/tests/py/inet/ether.t.payload.ip6
index 9065952d2646..a3a8905e6372 100644
--- a/tests/py/inet/ether.t.payload.ip6
+++ b/tests/py/inet/ether.t.payload.ip6
@@ -1,6 +1,6 @@
# tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 meta nfproto ipv4 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
@@ -14,7 +14,7 @@ ip6 test-ip6 input
# tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
@@ -26,7 +26,7 @@ ip6 test-ip6 input
# tcp dport 22 ether saddr 00:0f:54:0c:11:04 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
diff --git a/tests/py/inet/icmpX.t.payload b/tests/py/inet/icmpX.t.payload
index 81ca7744c4e4..4df15d7fb28c 100644
--- a/tests/py/inet/icmpX.t.payload
+++ b/tests/py/inet/icmpX.t.payload
@@ -27,9 +27,7 @@ inet test-inet input
# icmpv6 type echo-request
inet test-inet input
- [ meta load nfproto => reg 1 ]
- [ cmp eq reg 1 0x0000000a ]
- [ 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 ]
diff --git a/tests/py/inet/sctp.t.payload.ip6 b/tests/py/inet/sctp.t.payload.ip6
index 5c63d2adf64c..9775804d55ef 100644
--- a/tests/py/inet/sctp.t.payload.ip6
+++ b/tests/py/inet/sctp.t.payload.ip6
@@ -1,20 +1,20 @@
# sctp sport 23
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00001700 ]
# sctp sport != 23
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp neq reg 1 0x00001700 ]
# sctp sport 23-44
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp gte reg 1 0x00001700 ]
@@ -22,7 +22,7 @@ ip6 test-ip6 input
# sctp sport != 23-44
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ range neq reg 1 0x00001700 0x00002c00 ]
@@ -32,7 +32,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -42,7 +42,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -52,7 +52,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00001700 : 0 [end] element 00002d00 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -62,28 +62,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00001700 : 0 [end] element 00002d00 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# sctp dport 23
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001700 ]
# sctp dport != 23
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp neq reg 1 0x00001700 ]
# sctp dport 23-44
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00001700 ]
@@ -91,7 +91,7 @@ ip6 test-ip6 input
# sctp dport != 23-44
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ range neq reg 1 0x00001700 0x00002c00 ]
@@ -101,7 +101,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -111,7 +111,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00001700 : 0 [end] element 00001800 : 0 [end] element 00001900 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -121,7 +121,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00001700 : 0 [end] element 00002d00 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -131,28 +131,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00001700 : 0 [end] element 00002d00 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# sctp checksum 1111
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ cmp eq reg 1 0x57040000 ]
# sctp checksum != 11
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ cmp neq reg 1 0x0b000000 ]
# sctp checksum 21-333
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ cmp gte reg 1 0x15000000 ]
@@ -160,7 +160,7 @@ ip6 test-ip6 input
# sctp checksum != 32-111
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ range neq reg 1 0x20000000 0x6f000000 ]
@@ -170,7 +170,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 16000000 : 0 [end] element 21000000 : 0 [end] element 2c000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -180,7 +180,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 16000000 : 0 [end] element 21000000 : 0 [end] element 2c000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -190,7 +190,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 16000000 : 0 [end] element 2d000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -200,28 +200,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 16000000 : 0 [end] element 2d000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# sctp vtag 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp eq reg 1 0x16000000 ]
# sctp vtag != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp neq reg 1 0xe9000000 ]
# sctp vtag 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp gte reg 1 0x21000000 ]
@@ -229,7 +229,7 @@ ip6 test-ip6 input
# sctp vtag != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ range neq reg 1 0x21000000 0x2d000000 ]
@@ -239,7 +239,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -249,7 +249,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -259,7 +259,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -269,7 +269,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000084 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
diff --git a/tests/py/inet/tcp.t.payload.ip6 b/tests/py/inet/tcp.t.payload.ip6
index b1b361ec77f5..a335f594cbc2 100644
--- a/tests/py/inet/tcp.t.payload.ip6
+++ b/tests/py/inet/tcp.t.payload.ip6
@@ -1,20 +1,20 @@
# tcp dport 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# tcp dport != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# tcp dport 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -22,7 +22,7 @@ ip6 test-ip6 input
# tcp dport != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -32,7 +32,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -42,7 +42,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -52,7 +52,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -62,7 +62,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -72,7 +72,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00001700 : 0 [end] element 00005000 : 0 [end] element 0000bb01 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -83,7 +83,7 @@ __map%d test-ip6 b
__map%d test-ip6 0
element 00001600 : 0 [end] element 00001700 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __map%d dreg 0 ]
@@ -93,7 +93,7 @@ __map%d test-ip6 b
__map%d test-ip6 0
element 00001900 : 0 [end] element 00001c00 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __map%d dreg 0 ]
@@ -103,7 +103,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00001600 : 0 [end] element 00003500 : 0 [end] element 00005000 : 0 [end] element 00006e00 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -113,28 +113,28 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00001600 : 0 [end] element 00003500 : 0 [end] element 00005000 : 0 [end] element 00006e00 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# tcp sport 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# tcp sport != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# tcp sport 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -142,7 +142,7 @@ ip6 test-ip6 input
# tcp sport != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -152,7 +152,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -162,7 +162,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -172,7 +172,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -182,7 +182,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -192,14 +192,14 @@ __map%d test-ip6 b
__map%d test-ip6 0
element 00001900 : 0 [end] element 00001c00 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __map%d dreg 0 ]
# tcp sport 8080 drop
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x0000901f ]
@@ -207,21 +207,21 @@ ip6 test-ip6 input
# tcp sport 1024 tcp dport 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x16000004 ]
# tcp sport 1024 tcp dport 22 tcp sequence 0
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 8b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x16000004 0x00000000 ]
# tcp sequence 0 tcp sport 1024 tcp dport 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 8b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x16000004 0x00000000 ]
@@ -231,7 +231,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000004 : 0 [end] element 0000fe03 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -240,21 +240,21 @@ ip6 test-ip6 input
# tcp sequence 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp eq reg 1 0x16000000 ]
# tcp sequence != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp neq reg 1 0xe9000000 ]
# tcp sequence 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp gte reg 1 0x21000000 ]
@@ -262,7 +262,7 @@ ip6 test-ip6 input
# tcp sequence != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ range neq reg 1 0x21000000 0x2d000000 ]
@@ -272,7 +272,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -282,7 +282,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -292,7 +292,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -302,14 +302,14 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# tcp ackseq 42949672 drop
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ cmp eq reg 1 0x285c8f02 ]
@@ -317,21 +317,21 @@ ip6 test-ip6 input
# tcp ackseq 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ cmp eq reg 1 0x16000000 ]
# tcp ackseq != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ cmp neq reg 1 0xe9000000 ]
# tcp ackseq 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ cmp gte reg 1 0x21000000 ]
@@ -339,7 +339,7 @@ ip6 test-ip6 input
# tcp ackseq != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ range neq reg 1 0x21000000 0x2d000000 ]
@@ -349,7 +349,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -359,7 +359,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -369,7 +369,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -379,7 +379,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 4b @ transport header + 8 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -389,7 +389,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000001 : 0 [end] element 00000002 : 0 [end] element 00000004 : 0 [end] element 00000008 : 0 [end] element 00000010 : 0 [end] element 00000020 : 0 [end] element 00000040 : 0 [end] element 00000080 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 1b @ transport header + 13 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -400,7 +400,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000001 : 0 [end] element 00000020 : 0 [end] element 00000040 : 0 [end] element 00000080 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 1b @ transport header + 13 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -408,7 +408,7 @@ ip6 test-ip6 input
# tcp flags cwr
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 1b @ transport header + 13 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00000080 ) ^ 0x00000000 ]
@@ -416,14 +416,14 @@ ip6 test-ip6 input
# tcp flags != cwr
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 1b @ transport header + 13 => reg 1 ]
[ cmp neq reg 1 0x00000080 ]
# tcp 'flags & (syn|fin) == (syn|fin)'
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 1b @ transport header + 13 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00000003 ) ^ 0x00000000 ]
@@ -431,28 +431,28 @@ ip6 test-ip6 input
# tcp window 22222
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 14 => reg 1 ]
[ cmp eq reg 1 0x0000ce56 ]
# tcp window 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 14 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# tcp window != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 14 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# tcp window 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 14 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -460,7 +460,7 @@ ip6 test-ip6 input
# tcp window != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 14 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -470,7 +470,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 14 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -480,7 +480,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 14 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -490,7 +490,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 14 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -500,28 +500,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 14 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# tcp checksum 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 16 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# tcp checksum != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 16 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# tcp checksum 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 16 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -529,7 +529,7 @@ ip6 test-ip6 input
# tcp checksum != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 16 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -539,7 +539,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 16 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -549,7 +549,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 16 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -559,7 +559,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 16 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -569,14 +569,14 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 16 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# tcp urgptr 1234 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 18 => reg 1 ]
[ cmp eq reg 1 0x0000d204 ]
@@ -584,21 +584,21 @@ ip6 test-ip6 input
# tcp urgptr 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 18 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# tcp urgptr != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 18 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# tcp urgptr 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 18 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -606,7 +606,7 @@ ip6 test-ip6 input
# tcp urgptr != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 18 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -616,7 +616,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 18 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -626,7 +626,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 18 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -636,7 +636,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 18 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -646,14 +646,14 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 18 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# tcp doff 8
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 1b @ transport header + 12 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x000000f0 ) ^ 0x00000000 ]
diff --git a/tests/py/inet/udp.t.payload.ip6 b/tests/py/inet/udp.t.payload.ip6
index d16e0075f8ee..8edcff4faa29 100644
--- a/tests/py/inet/udp.t.payload.ip6
+++ b/tests/py/inet/udp.t.payload.ip6
@@ -1,6 +1,6 @@
# udp sport 80 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00005000 ]
@@ -8,7 +8,7 @@ ip6 test-ip6 input
# udp sport != 60 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp neq reg 1 0x00003c00 ]
@@ -16,7 +16,7 @@ ip6 test-ip6 input
# udp sport 50-70 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp gte reg 1 0x00003200 ]
@@ -25,7 +25,7 @@ ip6 test-ip6 input
# udp sport != 50-60 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ range neq reg 1 0x00003200 0x00003c00 ]
@@ -36,7 +36,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00003100 : 0 [end] element 00003200 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -47,7 +47,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00003200 : 0 [end] element 00003c00 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -58,7 +58,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000c00 : 0 [end] element 00002900 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -68,14 +68,14 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000d00 : 0 [end] element 00001900 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# udp dport 80 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00005000 ]
@@ -83,7 +83,7 @@ ip6 test-ip6 input
# udp dport != 60 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp neq reg 1 0x00003c00 ]
@@ -91,7 +91,7 @@ ip6 test-ip6 input
# udp dport 70-75 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00004600 ]
@@ -100,7 +100,7 @@ ip6 test-ip6 input
# udp dport != 50-60 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ range neq reg 1 0x00003200 0x00003c00 ]
@@ -111,7 +111,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00003100 : 0 [end] element 00003200 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -122,7 +122,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00003200 : 0 [end] element 00003c00 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -133,7 +133,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00004600 : 0 [end] element 00004c00 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -144,7 +144,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00003200 : 0 [end] element 00003d00 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -152,21 +152,21 @@ ip6 test-ip6 input
# udp length 6666
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ cmp eq reg 1 0x00000a1a ]
# udp length != 6666
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ cmp neq reg 1 0x00000a1a ]
# udp length 50-65 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ cmp gte reg 1 0x00003200 ]
@@ -175,7 +175,7 @@ ip6 test-ip6 input
# udp length != 50-65 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ range neq reg 1 0x00003200 0x00004100 ]
@@ -186,7 +186,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00003200 : 0 [end] element 00004100 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -197,7 +197,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00003200 : 0 [end] element 00004100 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -208,7 +208,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002300 : 0 [end] element 00003300 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -218,14 +218,14 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002300 : 0 [end] element 00003300 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# udp checksum 6666 drop
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp eq reg 1 0x00000a1a ]
@@ -236,7 +236,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 0000bc01 : 0 [end] element 00002b02 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -244,21 +244,21 @@ ip6 test-ip6 input
# udp checksum 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# udp checksum != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# udp checksum 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -266,7 +266,7 @@ ip6 test-ip6 input
# udp checksum != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -276,7 +276,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -286,7 +286,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -296,7 +296,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -306,7 +306,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -315,7 +315,7 @@ ip6 test-ip6 input
ip6 test-ip6 input
[ meta load iif => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ immediate reg 1 0x00000000 ]
[ payload write reg 1 => 2b @ transport header + 6 csum_type 1 csum_off 6 csum_flags 0x0 ]
@@ -324,7 +324,7 @@ ip6 test-ip6 input
ip test-ip4 input
[ meta load iif => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ immediate reg 1 0x0000ffff ]
[ payload write reg 1 => 2b @ transport header + 2 csum_type 1 csum_off 6 csum_flags 0x0 ]
diff --git a/tests/py/inet/udplite.t.payload.ip6 b/tests/py/inet/udplite.t.payload.ip6
index 47f25cd291f9..d2f032e905e0 100644
--- a/tests/py/inet/udplite.t.payload.ip6
+++ b/tests/py/inet/udplite.t.payload.ip6
@@ -1,6 +1,6 @@
# udplite sport 80 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00005000 ]
@@ -8,7 +8,7 @@ ip6 test-ip6 input
# udplite sport != 60 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp neq reg 1 0x00003c00 ]
@@ -16,7 +16,7 @@ ip6 test-ip6 input
# udplite sport 50-70 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ cmp gte reg 1 0x00003200 ]
@@ -25,7 +25,7 @@ ip6 test-ip6 input
# udplite sport != 50-60 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ range neq reg 1 0x00003200 0x00003c00 ]
@@ -36,7 +36,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00003100 : 0 [end] element 00003200 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -47,7 +47,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00003100 : 0 [end] element 00003200 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -58,7 +58,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00000c00 : 0 [end] element 00002900 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -68,14 +68,14 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00000c00 : 0 [end] element 00002900 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# udplite dport 80 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00005000 ]
@@ -83,7 +83,7 @@ ip6 test-ip6 input
# udplite dport != 60 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp neq reg 1 0x00003c00 ]
@@ -91,7 +91,7 @@ ip6 test-ip6 input
# udplite dport 70-75 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00004600 ]
@@ -100,7 +100,7 @@ ip6 test-ip6 input
# udplite dport != 50-60 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ range neq reg 1 0x00003200 0x00003c00 ]
@@ -111,7 +111,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00003100 : 0 [end] element 00003200 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -122,7 +122,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00003100 : 0 [end] element 00003200 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -133,7 +133,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00004600 : 0 [end] element 00004c00 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -144,7 +144,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00004600 : 0 [end] element 00004c00 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -152,7 +152,7 @@ ip6 test-ip6 input
# udplite checksum 6666 drop
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp eq reg 1 0x00000a1a ]
@@ -163,7 +163,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 0000bc01 : 0 [end] element 00002b02 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -171,21 +171,21 @@ ip6 test-ip6 input
# udplite checksum 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# udplite checksum != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# udplite checksum 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -193,7 +193,7 @@ ip6 test-ip6 input
# udplite checksum != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -203,7 +203,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -213,7 +213,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -223,7 +223,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -233,7 +233,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000088 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
diff --git a/tests/py/ip6/dnat.t.payload.ip6 b/tests/py/ip6/dnat.t.payload.ip6
index 8bd5819e0360..4d3fafe2bf02 100644
--- a/tests/py/ip6/dnat.t.payload.ip6
+++ b/tests/py/ip6/dnat.t.payload.ip6
@@ -1,6 +1,6 @@
# tcp dport 80-90 dnat to [2001:838:35f:1::]-[2001:838:35f:2::]:80-100
ip6 test-ip6 prerouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00005000 ]
@@ -13,7 +13,7 @@ ip6 test-ip6 prerouting
# tcp dport 80-90 dnat to [2001:838:35f:1::]-[2001:838:35f:2::]:100
ip6 test-ip6 prerouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00005000 ]
@@ -25,7 +25,7 @@ ip6 test-ip6 prerouting
# tcp dport 80-90 dnat to [2001:838:35f:1::]:80
ip6 test-ip6 prerouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00005000 ]
diff --git a/tests/py/ip6/ether.t.payload b/tests/py/ip6/ether.t.payload
index c7342cc0c79e..592b4ea0e0bc 100644
--- a/tests/py/ip6/ether.t.payload
+++ b/tests/py/ip6/ether.t.payload
@@ -1,6 +1,6 @@
# tcp dport 22 iiftype ether ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:4 accept
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
@@ -14,7 +14,7 @@ ip6 test-ip6 input
# tcp dport 22 ip6 daddr 1::2 ether saddr 00:0f:54:0c:11:04
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
@@ -27,7 +27,7 @@ ip6 test-ip6 input
# tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip6 daddr 1::2
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
diff --git a/tests/py/ip6/icmpv6.t.payload.ip6 b/tests/py/ip6/icmpv6.t.payload.ip6
index 30f58ca3615b..7a630f9f8b09 100644
--- a/tests/py/ip6/icmpv6.t.payload.ip6
+++ b/tests/py/ip6/icmpv6.t.payload.ip6
@@ -1,6 +1,6 @@
# icmpv6 type destination-unreachable accept
ip6 test-ip6 input
- [ 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 0x00000001 ]
@@ -8,7 +8,7 @@ ip6 test-ip6 input
# icmpv6 type packet-too-big accept
ip6 test-ip6 input
- [ 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 0x00000002 ]
@@ -16,7 +16,7 @@ ip6 test-ip6 input
# icmpv6 type time-exceeded accept
ip6 test-ip6 input
- [ 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 0x00000003 ]
@@ -24,7 +24,7 @@ ip6 test-ip6 input
# icmpv6 type echo-request accept
ip6 test-ip6 input
- [ 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 ]
@@ -32,7 +32,7 @@ ip6 test-ip6 input
# icmpv6 type echo-reply accept
ip6 test-ip6 input
- [ 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 0x00000081 ]
@@ -40,7 +40,7 @@ ip6 test-ip6 input
# icmpv6 type mld-listener-query accept
ip6 test-ip6 input
- [ 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 0x00000082 ]
@@ -48,7 +48,7 @@ ip6 test-ip6 input
# icmpv6 type mld-listener-report accept
ip6 test-ip6 input
- [ 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 0x00000083 ]
@@ -56,7 +56,7 @@ ip6 test-ip6 input
# icmpv6 type mld-listener-done accept
ip6 test-ip6 input
- [ 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 0x00000084 ]
@@ -64,7 +64,7 @@ ip6 test-ip6 input
# icmpv6 type mld-listener-reduction accept
ip6 test-ip6 input
- [ 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 0x00000084 ]
@@ -72,7 +72,7 @@ ip6 test-ip6 input
# icmpv6 type nd-router-solicit accept
ip6 test-ip6 input
- [ 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 0x00000085 ]
@@ -80,7 +80,7 @@ ip6 test-ip6 input
# icmpv6 type nd-router-advert accept
ip6 test-ip6 input
- [ 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 0x00000086 ]
@@ -88,7 +88,7 @@ ip6 test-ip6 input
# icmpv6 type nd-neighbor-solicit accept
ip6 test-ip6 input
- [ 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 0x00000087 ]
@@ -96,7 +96,7 @@ ip6 test-ip6 input
# icmpv6 type nd-neighbor-advert accept
ip6 test-ip6 input
- [ 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 0x00000088 ]
@@ -104,7 +104,7 @@ ip6 test-ip6 input
# icmpv6 type nd-redirect accept
ip6 test-ip6 input
- [ 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 0x00000089 ]
@@ -112,7 +112,7 @@ ip6 test-ip6 input
# icmpv6 type parameter-problem accept
ip6 test-ip6 input
- [ 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 0x00000004 ]
@@ -120,7 +120,7 @@ ip6 test-ip6 input
# icmpv6 type router-renumbering accept
ip6 test-ip6 input
- [ 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 0x0000008a ]
@@ -128,7 +128,7 @@ ip6 test-ip6 input
# icmpv6 type ind-neighbor-solicit accept
ip6 test-ip6 input
- [ 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 0x0000008d ]
@@ -136,7 +136,7 @@ ip6 test-ip6 input
# icmpv6 type ind-neighbor-advert accept
ip6 test-ip6 input
- [ 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 0x0000008e ]
@@ -144,7 +144,7 @@ ip6 test-ip6 input
# icmpv6 type mld2-listener-report accept
ip6 test-ip6 input
- [ 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 0x0000008f ]
@@ -155,7 +155,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000001 : 0 [end] element 00000003 : 0 [end] element 00000085 : 0 [end]
ip6 test-ip6 input
- [ 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 ]
[ lookup reg 1 set __set%d ]
@@ -166,7 +166,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 0000008a : 0 [end] element 00000084 : 0 [end] element 00000003 : 0 [end] element 00000085 : 0 [end]
ip6 test-ip6 input
- [ 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 ]
[ lookup reg 1 set __set%d ]
@@ -177,7 +177,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000082 : 0 [end] element 00000003 : 0 [end] element 00000086 : 0 [end]
ip6 test-ip6 input
- [ 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 ]
[ lookup reg 1 set __set%d ]
@@ -188,7 +188,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000082 : 0 [end] element 00000003 : 0 [end] element 00000086 : 0 [end]
ip6 test-ip6 input
- [ 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 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -196,14 +196,14 @@ ip6 test-ip6 input
# icmpv6 code 4
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ cmp eq reg 1 0x00000004 ]
# icmpv6 code 3-66
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ cmp gte reg 1 0x00000003 ]
@@ -214,7 +214,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000005 : 0 [end] element 00000006 : 0 [end] element 00000007 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -225,7 +225,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000005 : 0 [end] element 00000006 : 0 [end] element 00000007 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -236,7 +236,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000003 : 0 [end] element 00000043 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -246,14 +246,14 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000003 : 0 [end] element 00000043 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmpv6 checksum 2222 log
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000ae08 ]
@@ -261,7 +261,7 @@ ip6 test-ip6 input
# icmpv6 checksum != 2222 log
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp neq reg 1 0x0000ae08 ]
@@ -269,7 +269,7 @@ ip6 test-ip6 input
# icmpv6 checksum 222-226
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x0000de00 ]
@@ -277,7 +277,7 @@ ip6 test-ip6 input
# icmpv6 checksum != 2222 log
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp neq reg 1 0x0000ae08 ]
@@ -288,7 +288,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 0000de00 : 0 [end] element 0000e200 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -298,7 +298,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 0000de00 : 0 [end] element 0000e200 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -308,7 +308,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 0000de00 : 0 [end] element 0000e300 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -318,28 +318,28 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 0000de00 : 0 [end] element 0000e300 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmpv6 mtu 22
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp eq reg 1 0x16000000 ]
# icmpv6 mtu != 233
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp neq reg 1 0xe9000000 ]
# icmpv6 mtu 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp gte reg 1 0x21000000 ]
@@ -347,7 +347,7 @@ ip6 test-ip6 input
# icmpv6 mtu != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ range neq reg 1 0x21000000 0x2d000000 ]
@@ -357,7 +357,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -367,7 +367,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -377,7 +377,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -387,14 +387,14 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmpv6 id 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -402,7 +402,7 @@ ip6 test-ip6 input
# icmpv6 id != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -412,7 +412,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -422,7 +422,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -432,7 +432,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -442,14 +442,14 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmpv6 sequence 2
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp eq reg 1 0x00000200 ]
@@ -459,7 +459,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000300 : 0 [end] element 00000400 : 0 [end] element 00000500 : 0 [end] element 00000600 : 0 [end] element 00000700 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -470,7 +470,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000300 : 0 [end] element 00000400 : 0 [end] element 00000500 : 0 [end] element 00000600 : 0 [end] element 00000700 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -481,7 +481,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000200 : 0 [end] element 00000400 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -491,14 +491,14 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000200 : 0 [end] element 00000400 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmpv6 sequence 2-4
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp gte reg 1 0x00000200 ]
@@ -506,7 +506,7 @@ ip6 test-ip6 input
# icmpv6 sequence != 2-4
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ range neq reg 1 0x00000200 0x00000400 ]
@@ -516,7 +516,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000200 : 0 [end] element 00000500 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -526,14 +526,14 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00000200 : 0 [end] element 00000500 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmpv6 max-delay 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -541,7 +541,7 @@ ip6 test-ip6 input
# icmpv6 max-delay != 33-45
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -551,7 +551,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -561,7 +561,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -571,7 +571,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -581,7 +581,7 @@ __set%d test-ip6 7
__set%d test-ip6 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip6 test-ip6 input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x0000003a ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
diff --git a/tests/py/ip6/masquerade.t.payload.ip6 b/tests/py/ip6/masquerade.t.payload.ip6
index 31cedf1ff00c..04f328b8c65e 100644
--- a/tests/py/ip6/masquerade.t.payload.ip6
+++ b/tests/py/ip6/masquerade.t.payload.ip6
@@ -1,6 +1,6 @@
# udp dport 53 masquerade
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -8,7 +8,7 @@ ip6 test-ip6 postrouting
# udp dport 53 masquerade random
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -16,7 +16,7 @@ ip6 test-ip6 postrouting
# udp dport 53 masquerade random,persistent
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -24,7 +24,7 @@ ip6 test-ip6 postrouting
# udp dport 53 masquerade random,persistent,fully-random
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -32,7 +32,7 @@ ip6 test-ip6 postrouting
# udp dport 53 masquerade random,fully-random
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -40,7 +40,7 @@ ip6 test-ip6 postrouting
# udp dport 53 masquerade random,fully-random,persistent
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -48,7 +48,7 @@ ip6 test-ip6 postrouting
# udp dport 53 masquerade persistent
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -56,7 +56,7 @@ ip6 test-ip6 postrouting
# udp dport 53 masquerade persistent,random
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -64,7 +64,7 @@ ip6 test-ip6 postrouting
# udp dport 53 masquerade persistent,random,fully-random
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -72,7 +72,7 @@ ip6 test-ip6 postrouting
# udp dport 53 masquerade persistent,fully-random
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -80,7 +80,7 @@ ip6 test-ip6 postrouting
# udp dport 53 masquerade persistent,fully-random,random
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -91,7 +91,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000100 : 0 [end] element 00000200 : 0 [end] element 00000300 : 0 [end] element 00000400 : 0 [end] element 00000500 : 0 [end] element 00000600 : 0 [end] element 00000700 : 0 [end] element 00000800 : 0 [end] element 00006500 : 0 [end] element 0000ca00 : 0 [end] element 00002f01 : 0 [end] element 0000e903 : 0 [end] element 0000d207 : 0 [end] element 0000bb0b : 0 [end]
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -102,7 +102,7 @@ ip6 test-ip6 postrouting
[ payload load 16b @ network header + 24 => reg 1 ]
[ cmp gte reg 1 0x000000fe 0x00000000 0x00000000 0x01000000 ]
[ cmp lte reg 1 0x000000fe 0x00000000 0x00000000 0x00020000 ]
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -119,7 +119,7 @@ ip6 test-ip6 postrouting
[ ct load state => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000000a ) ^ 0x00000000 ]
[ cmp neq reg 1 0x00000000 ]
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __map%d dreg 0 ]
diff --git a/tests/py/ip6/redirect.t.payload.ip6 b/tests/py/ip6/redirect.t.payload.ip6
index f256326acf4b..8731194f729e 100644
--- a/tests/py/ip6/redirect.t.payload.ip6
+++ b/tests/py/ip6/redirect.t.payload.ip6
@@ -4,7 +4,7 @@ ip6 test-ip6 output
# udp dport 954 redirect
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000ba03 ]
@@ -19,7 +19,7 @@ ip6 test-ip6 output
# udp dport 53 redirect random
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -27,7 +27,7 @@ ip6 test-ip6 output
# udp dport 53 redirect random,persistent
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -35,7 +35,7 @@ ip6 test-ip6 output
# udp dport 53 redirect random,persistent,fully-random
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -43,7 +43,7 @@ ip6 test-ip6 output
# udp dport 53 redirect random,fully-random
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -51,7 +51,7 @@ ip6 test-ip6 output
# udp dport 53 redirect random,fully-random,persistent
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -59,7 +59,7 @@ ip6 test-ip6 output
# udp dport 53 redirect persistent
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -67,7 +67,7 @@ ip6 test-ip6 output
# udp dport 53 redirect persistent,random
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -75,7 +75,7 @@ ip6 test-ip6 output
# udp dport 53 redirect persistent,random,fully-random
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -83,7 +83,7 @@ ip6 test-ip6 output
# udp dport 53 redirect persistent,fully-random
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -91,7 +91,7 @@ ip6 test-ip6 output
# udp dport 53 redirect persistent,fully-random,random
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -99,7 +99,7 @@ ip6 test-ip6 output
# udp dport 1234 redirect to :1234
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000d204 ]
@@ -110,7 +110,7 @@ ip6 test-ip6 output
ip6 test-ip6 output
[ payload load 16b @ network header + 24 => reg 1 ]
[ cmp eq reg 1 0x000000fe 0x00000000 0x00000000 0xfeca0000 ]
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00000e27 ]
@@ -127,7 +127,7 @@ ip6 test-ip6 output
# tcp dport 39128 redirect to :993
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000d898 ]
@@ -136,7 +136,7 @@ ip6 test-ip6 output
# tcp dport 9128 redirect to :993 random
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000a823 ]
@@ -145,7 +145,7 @@ ip6 test-ip6 output
# tcp dport 9128 redirect to :993 fully-random,persistent
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000a823 ]
@@ -157,7 +157,7 @@ __set%d test-ip6 3
__set%d test-ip6 0
element 00000100 : 0 [end] element 00000200 : 0 [end] element 00000300 : 0 [end] element 00000400 : 0 [end] element 00000500 : 0 [end] element 00000600 : 0 [end] element 00000700 : 0 [end] element 00000800 : 0 [end] element 00006500 : 0 [end] element 0000ca00 : 0 [end] element 00002f01 : 0 [end] element 0000e903 : 0 [end] element 0000d207 : 0 [end] element 0000bb0b : 0 [end]
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -168,7 +168,7 @@ ip6 test-ip6 output
[ payload load 16b @ network header + 24 => reg 1 ]
[ cmp gte reg 1 0x000000fe 0x00000000 0x00000000 0x01000000 ]
[ cmp lte reg 1 0x000000fe 0x00000000 0x00000000 0x00020000 ]
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -185,7 +185,7 @@ ip6 test-ip6 output
[ ct load state => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000000a ) ^ 0x00000000 ]
[ cmp neq reg 1 0x00000000 ]
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __map%d dreg 0 ]
diff --git a/tests/py/ip6/reject.t.payload.ip6 b/tests/py/ip6/reject.t.payload.ip6
index fcae382b89c6..0ba5f7ee5bfd 100644
--- a/tests/py/ip6/reject.t.payload.ip6
+++ b/tests/py/ip6/reject.t.payload.ip6
@@ -28,7 +28,7 @@ ip6 test-ip6 output
# reject with tcp reset
ip6 test-ip6 output
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ reject type 1 code 0 ]
diff --git a/tests/py/ip6/snat.t.payload.ip6 b/tests/py/ip6/snat.t.payload.ip6
index ea403638dd8f..537e6682aa38 100644
--- a/tests/py/ip6/snat.t.payload.ip6
+++ b/tests/py/ip6/snat.t.payload.ip6
@@ -1,6 +1,6 @@
# tcp dport 80-90 snat to [2001:838:35f:1::]-[2001:838:35f:2::]:80-100
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00005000 ]
@@ -13,7 +13,7 @@ ip6 test-ip6 postrouting
# tcp dport 80-90 snat to [2001:838:35f:1::]-[2001:838:35f:2::]:100
ip6 test-ip6 postrouting
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00005000 ]
diff --git a/tests/py/ip6/tcpopt.t.payload b/tests/py/ip6/tcpopt.t.payload
index 88e277d1c94b..4b1891974c75 100644
--- a/tests/py/ip6/tcpopt.t.payload
+++ b/tests/py/ip6/tcpopt.t.payload
@@ -1,181 +1,181 @@
# tcp option eol kind 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 0 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option noop kind 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 1 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option maxseg kind 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 2 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option maxseg length 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 2 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option maxseg size 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 2b @ 2 + 2 => reg 1 ]
[ cmp eq reg 1 0x00000100 ]
# tcp option window kind 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 3 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option window length 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 3 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option window count 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 3 + 2 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option sack-permitted kind 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option sack-permitted length 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 4 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option sack kind 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 5 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option sack length 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 5 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option sack left 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack0 left 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack1 left 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 10 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack2 left 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 18 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack3 left 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 26 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack right 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack0 right 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack1 right 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 14 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack2 right 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 22 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack3 right 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 30 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option timestamp kind 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 8 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option timestamp length 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 8 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option timestamp tsval 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 8 + 2 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option timestamp tsecr 1
ip6 test-ip input
- [ payload load 1b @ network header + 6 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 8 + 6 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
--
2.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH nft 05/10] tests: meta: add icmpv6 test case
2017-05-09 15:51 [PATCH nft 00/10] switch l4 dependency to meta l4proto Florian Westphal
` (3 preceding siblings ...)
2017-05-09 15:51 ` [PATCH nft 04/10] tests: fix up meta l4proto change for ip6 family Florian Westphal
@ 2017-05-09 15:51 ` Florian Westphal
2017-05-09 15:51 ` [PATCH nft 06/10] netlink_delinearize: reject: remove dependency for tcp-resets Florian Westphal
` (4 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Florian Westphal @ 2017-05-09 15:51 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
Signed-off-by: Florian Westphal <fw@strlen.de>
---
tests/py/any/meta.t | 1 +
tests/py/any/meta.t.payload | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/tests/py/any/meta.t b/tests/py/any/meta.t
index c3ac0a4c267a..2ff942ff039d 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 e432656624b6..871f1ada5abe 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 ]
--
2.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH nft 06/10] netlink_delinearize: reject: remove dependency for tcp-resets
2017-05-09 15:51 [PATCH nft 00/10] switch l4 dependency to meta l4proto Florian Westphal
` (4 preceding siblings ...)
2017-05-09 15:51 ` [PATCH nft 05/10] tests: meta: add icmpv6 test case Florian Westphal
@ 2017-05-09 15:51 ` Florian Westphal
2017-05-09 15:51 ` [PATCH nft 07/10] tests: add ip reject with tcp and check for mark too Florian Westphal
` (3 subsequent siblings)
9 siblings, 0 replies; 23+ messages in thread
From: Florian Westphal @ 2017-05-09 15:51 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
We can remove a l4 dependency in ip/ipv6 families.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
src/netlink_delinearize.c | 6 ++++++
tests/py/ip6/reject.t | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index f0288cd49914..49dc6a6016ba 100644
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -1856,10 +1856,16 @@ static void stmt_reject_postprocess(struct rule_pp_ctx *rctx)
case NFPROTO_IPV4:
stmt->reject.family = rctx->pctx.family;
stmt->reject.expr->dtype = &icmp_code_type;
+ if (stmt->reject.type == NFT_REJECT_TCP_RST)
+ __payload_dependency_kill(&rctx->pdctx,
+ PROTO_BASE_TRANSPORT_HDR);
break;
case NFPROTO_IPV6:
stmt->reject.family = rctx->pctx.family;
stmt->reject.expr->dtype = &icmpv6_code_type;
+ if (stmt->reject.type == NFT_REJECT_TCP_RST)
+ __payload_dependency_kill(&rctx->pdctx,
+ PROTO_BASE_TRANSPORT_HDR);
break;
case NFPROTO_INET:
if (stmt->reject.type == NFT_REJECT_ICMPX_UNREACH) {
diff --git a/tests/py/ip6/reject.t b/tests/py/ip6/reject.t
index 7d21aa8ef160..de09fd978418 100644
--- a/tests/py/ip6/reject.t
+++ b/tests/py/ip6/reject.t
@@ -9,7 +9,7 @@ reject with icmpv6 type addr-unreachable;ok
reject with icmpv6 type port-unreachable;ok;reject
reject with icmpv6 type policy-fail;ok
reject with icmpv6 type reject-route;ok
-reject with tcp reset;ok;ip6 nexthdr 6 reject with tcp reset
+reject with tcp reset;ok
reject with icmpv6 type host-unreachable;fail
reject with icmp type host-unreachable;fail
--
2.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH nft 07/10] tests: add ip reject with tcp and check for mark too
2017-05-09 15:51 [PATCH nft 00/10] switch l4 dependency to meta l4proto Florian Westphal
` (5 preceding siblings ...)
2017-05-09 15:51 ` [PATCH nft 06/10] netlink_delinearize: reject: remove dependency for tcp-resets Florian Westphal
@ 2017-05-09 15:51 ` Florian Westphal
2017-05-16 10:29 ` Pablo Neira Ayuso
2017-05-09 15:51 ` [PATCH nft 08/10] src: add a comment wrt. reject dependency insertion Florian Westphal
` (2 subsequent siblings)
9 siblings, 1 reply; 23+ messages in thread
From: Florian Westphal @ 2017-05-09 15:51 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
... to avoid resetting e.g. the ssh session to the vm that runs
nft-test.py.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
tests/py/bridge/reject.t | 2 +-
tests/py/bridge/reject.t.payload | 4 +++-
tests/py/inet/reject.t | 2 +-
tests/py/inet/reject.t.payload.inet | 4 +++-
tests/py/ip/reject.t | 1 +
tests/py/ip/reject.t.payload | 8 ++++++++
tests/py/ip6/reject.t | 2 +-
tests/py/ip6/reject.t.payload.ip6 | 4 +++-
8 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/tests/py/bridge/reject.t b/tests/py/bridge/reject.t
index 4fa6ac0b3278..67deac8d3b5e 100644
--- a/tests/py/bridge/reject.t
+++ b/tests/py/bridge/reject.t
@@ -16,7 +16,7 @@ reject with icmpv6 type admin-prohibited;ok;ether type ip6 reject with icmpv6 ty
reject with icmpv6 type addr-unreachable;ok;ether type ip6 reject with icmpv6 type addr-unreachable
reject with icmpv6 type port-unreachable;ok;ether type ip6 reject
-ip protocol tcp reject with tcp reset;ok;ip protocol 6 reject with tcp reset
+mark 12345 ip protocol tcp reject with tcp reset;ok;mark 0x00003039 ip protocol 6 reject with tcp reset
reject;ok
ether type ip reject;ok
diff --git a/tests/py/bridge/reject.t.payload b/tests/py/bridge/reject.t.payload
index f5a0e6a82963..b984f6f8de4d 100644
--- a/tests/py/bridge/reject.t.payload
+++ b/tests/py/bridge/reject.t.payload
@@ -64,8 +64,10 @@ bridge test-bridge input
[ cmp eq reg 1 0x0000dd86 ]
[ reject type 0 code 4 ]
-# ip protocol tcp reject with tcp reset
+# mark 12345 ip protocol tcp reject with tcp reset
bridge test-bridge input
+ [ meta load mark => reg 1 ]
+ [ cmp eq reg 1 0x00003039 ]
[ payload load 2b @ link header + 12 => reg 1 ]
[ cmp eq reg 1 0x00000008 ]
[ payload load 1b @ network header + 9 => reg 1 ]
diff --git a/tests/py/inet/reject.t b/tests/py/inet/reject.t
index 638f329cf4d5..7679407e6f8d 100644
--- a/tests/py/inet/reject.t
+++ b/tests/py/inet/reject.t
@@ -16,7 +16,7 @@ reject with icmpv6 type admin-prohibited;ok;meta nfproto ipv6 reject with icmpv6
reject with icmpv6 type addr-unreachable;ok;meta nfproto ipv6 reject with icmpv6 type addr-unreachable
reject with icmpv6 type port-unreachable;ok;meta nfproto ipv6 reject
-reject with tcp reset;ok;meta l4proto 6 reject with tcp reset
+mark 12345 reject with tcp reset;ok;meta l4proto 6 mark 0x00003039 reject with tcp reset
reject;ok
meta nfproto ipv4 reject;ok
diff --git a/tests/py/inet/reject.t.payload.inet b/tests/py/inet/reject.t.payload.inet
index 5770330d9072..7a6468e81f9e 100644
--- a/tests/py/inet/reject.t.payload.inet
+++ b/tests/py/inet/reject.t.payload.inet
@@ -64,10 +64,12 @@ inet test-inet input
[ cmp eq reg 1 0x0000000a ]
[ reject type 0 code 4 ]
-# reject with tcp reset
+# mark 12345 reject with tcp reset
inet test-inet input
[ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
+ [ meta load mark => reg 1 ]
+ [ cmp eq reg 1 0x00003039 ]
[ reject type 1 code 0 ]
# reject
diff --git a/tests/py/ip/reject.t b/tests/py/ip/reject.t
index 6006f0541cb8..7befe697fa23 100644
--- a/tests/py/ip/reject.t
+++ b/tests/py/ip/reject.t
@@ -10,6 +10,7 @@ reject with icmp type port-unreachable;ok;reject
reject with icmp type net-prohibited;ok
reject with icmp type host-prohibited;ok
reject with icmp type admin-prohibited;ok
+mark 0x80000000 reject with tcp reset;ok
reject with icmp type no-route;fail
reject with icmpv6 type no-route;fail
diff --git a/tests/py/ip/reject.t.payload b/tests/py/ip/reject.t.payload
index d5e87665ebc5..ec94b4c1a1c5 100644
--- a/tests/py/ip/reject.t.payload
+++ b/tests/py/ip/reject.t.payload
@@ -30,3 +30,11 @@ ip test-ip4 output
ip test-ip4 output
[ reject type 0 code 13 ]
+# mark 0x80000000 reject with tcp reset
+ip test-ip4 output
+ [ payload load 1b @ network header + 9 => reg 1 ]
+ [ cmp eq reg 1 0x00000006 ]
+ [ meta load mark => reg 1 ]
+ [ cmp eq reg 1 0x80000000 ]
+ [ reject type 1 code 0 ]
+
diff --git a/tests/py/ip6/reject.t b/tests/py/ip6/reject.t
index de09fd978418..a95f2e3fe14a 100644
--- a/tests/py/ip6/reject.t
+++ b/tests/py/ip6/reject.t
@@ -9,7 +9,7 @@ reject with icmpv6 type addr-unreachable;ok
reject with icmpv6 type port-unreachable;ok;reject
reject with icmpv6 type policy-fail;ok
reject with icmpv6 type reject-route;ok
-reject with tcp reset;ok
+mark 0x80000000 reject with tcp reset;ok
reject with icmpv6 type host-unreachable;fail
reject with icmp type host-unreachable;fail
diff --git a/tests/py/ip6/reject.t.payload.ip6 b/tests/py/ip6/reject.t.payload.ip6
index 0ba5f7ee5bfd..dd4491ae47a8 100644
--- a/tests/py/ip6/reject.t.payload.ip6
+++ b/tests/py/ip6/reject.t.payload.ip6
@@ -26,9 +26,11 @@ ip6 test-ip6 output
ip6 test-ip6 output
[ reject type 0 code 6 ]
-# reject with tcp reset
+# mark 0x80000000 reject with tcp reset
ip6 test-ip6 output
[ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
+ [ meta load mark => reg 1 ]
+ [ cmp eq reg 1 0x80000000 ]
[ reject type 1 code 0 ]
--
2.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH nft 08/10] src: add a comment wrt. reject dependency insertion
2017-05-09 15:51 [PATCH nft 00/10] switch l4 dependency to meta l4proto Florian Westphal
` (6 preceding siblings ...)
2017-05-09 15:51 ` [PATCH nft 07/10] tests: add ip reject with tcp and check for mark too Florian Westphal
@ 2017-05-09 15:51 ` Florian Westphal
2017-05-09 15:51 ` [PATCH nft 09/10] src: ip: switch implicit dependencies to meta l4proto too Florian Westphal
2017-05-09 15:51 ` [PATCH nft 10/10] tests: fix up meta l4proto change for ip family Florian Westphal
9 siblings, 0 replies; 23+ messages in thread
From: Florian Westphal @ 2017-05-09 15:51 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
at first I thought this was a bug but this in fact seems the right
thing, add a comment/example why adding dependency as first statement makes
sense.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
src/evaluate.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/evaluate.c b/src/evaluate.c
index 1cfe7675162e..27cee98916db 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -2015,6 +2015,14 @@ static int stmt_reject_gen_dependency(struct eval_ctx *ctx, struct stmt *stmt,
if (payload_gen_dependency(ctx, payload, &nstmt) < 0)
return -1;
+ /*
+ * Unlike payload deps this adds the dependency at the beginning, i.e.
+ * log ... reject with tcp-reset
+ * turns into
+ * meta l4proto tcp log ... reject with tcp-reset
+ *
+ * Otherwise we'd log things that won't be rejected.
+ */
list_add(&nstmt->list, &ctx->rule->stmts);
return 0;
}
--
2.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH nft 09/10] src: ip: switch implicit dependencies to meta l4proto too
2017-05-09 15:51 [PATCH nft 00/10] switch l4 dependency to meta l4proto Florian Westphal
` (7 preceding siblings ...)
2017-05-09 15:51 ` [PATCH nft 08/10] src: add a comment wrt. reject dependency insertion Florian Westphal
@ 2017-05-09 15:51 ` Florian Westphal
2017-05-16 10:35 ` Pablo Neira Ayuso
2017-05-09 15:51 ` [PATCH nft 10/10] tests: fix up meta l4proto change for ip family Florian Westphal
9 siblings, 1 reply; 23+ messages in thread
From: Florian Westphal @ 2017-05-09 15:51 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
after ip6 nexthdr also switch ip to meta l4proto instead of ip protocol.
While its needed for ipv6 (due to extension headers) this isn't needed
for ip but it has the advantage that
tcp dport 22
produces same expressions for ip/ip6/inet families.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
src/payload.c | 17 +++++++++++------
src/proto.c | 3 ++-
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/payload.c b/src/payload.c
index 3a3fe8de97cf..5331b5832fd2 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -118,17 +118,22 @@ static const struct expr_ops payload_expr_ops = {
};
/*
- * ipv6 is special case, we normally use 'meta l4proto' to fetch the last
- * l4 header of the ipv6 extension header chain so we will also match
+ * We normally use 'meta l4proto' to fetch the last l4 header of the
+ * ipv6 extension header chain so we will also match
* tcp after a fragmentation header, for instance.
+ * For consistency we also use meta l4proto for ipv4.
*
- * If user specifically asks for nexthdr x, treat is as a full
- * dependency rather than injecting another (useless) meta l4 one.
+ * If user specifically asks for nexthdr x, don't add another (useless)
+ * meta dependency.
*/
static bool proto_key_is_protocol(const struct proto_desc *desc, unsigned int type)
{
- if (type == desc->protocol_key ||
- (desc == &proto_ip6 && type == IP6HDR_NEXTHDR))
+ if (type == desc->protocol_key)
+ return true;
+
+ if (desc == &proto_ip6 && type == IP6HDR_NEXTHDR)
+ return true;
+ if (desc == &proto_ip && type == IPHDR_PROTOCOL)
return true;
return false;
diff --git a/src/proto.c b/src/proto.c
index 3b20a5fd35b1..2afedf773045 100644
--- a/src/proto.c
+++ b/src/proto.c
@@ -587,7 +587,6 @@ const struct proto_desc proto_ip = {
.name = "ip",
.base = PROTO_BASE_NETWORK_HDR,
.checksum_key = IPHDR_CHECKSUM,
- .protocol_key = IPHDR_PROTOCOL,
.protocols = {
PROTO_LINK(IPPROTO_ICMP, &proto_icmp),
PROTO_LINK(IPPROTO_ESP, &proto_esp),
@@ -600,6 +599,7 @@ const struct proto_desc proto_ip = {
PROTO_LINK(IPPROTO_SCTP, &proto_sctp),
},
.templates = {
+ [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8),
[IPHDR_VERSION] = HDR_BITFIELD("version", &integer_type, 0, 4),
[IPHDR_HDRLENGTH] = HDR_BITFIELD("hdrlength", &integer_type, 4, 4),
[IPHDR_DSCP] = HDR_BITFIELD("dscp", &dscp_type, 8, 6),
@@ -779,6 +779,7 @@ const struct proto_desc proto_inet_service = {
PROTO_LINK(IPPROTO_TCP, &proto_tcp),
PROTO_LINK(IPPROTO_DCCP, &proto_dccp),
PROTO_LINK(IPPROTO_SCTP, &proto_sctp),
+ PROTO_LINK(IPPROTO_ICMP, &proto_icmp),
PROTO_LINK(IPPROTO_ICMPV6, &proto_icmp6),
},
.templates = {
--
2.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH nft 10/10] tests: fix up meta l4proto change for ip family
2017-05-09 15:51 [PATCH nft 00/10] switch l4 dependency to meta l4proto Florian Westphal
` (8 preceding siblings ...)
2017-05-09 15:51 ` [PATCH nft 09/10] src: ip: switch implicit dependencies to meta l4proto too Florian Westphal
@ 2017-05-09 15:51 ` Florian Westphal
9 siblings, 0 replies; 23+ messages in thread
From: Florian Westphal @ 2017-05-09 15:51 UTC (permalink / raw)
To: netfilter-devel; +Cc: Florian Westphal
We can delete some of the payload files now as ip/ip6/inet produce
same implicit meta l4proto dep.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
tests/py/bridge/icmpX.t.payload | 4 +-
tests/py/bridge/vlan.t.payload | 4 +-
tests/py/bridge/vlan.t.payload.netdev | 4 +-
tests/py/inet/{ah.t.payload.inet => ah.t.payload} | 0
tests/py/inet/ah.t.payload.ip | 262 --------
tests/py/inet/ah.t.payload.ip6 | 262 --------
tests/py/inet/ah.t.payload.netdev | 262 --------
.../inet/{comp.t.payload.inet => comp.t.payload} | 0
tests/py/inet/comp.t.payload.ip | 145 -----
tests/py/inet/comp.t.payload.ip6 | 145 -----
tests/py/inet/comp.t.payload.netdev | 145 -----
.../inet/{dccp.t.payload.inet => dccp.t.payload} | 0
tests/py/inet/dccp.t.payload.ip | 169 ------
tests/py/inet/dccp.t.payload.ip6 | 169 ------
tests/py/inet/dccp.t.payload.netdev | 169 ------
.../py/inet/{esp.t.payload.inet => esp.t.payload} | 0
tests/py/inet/esp.t.payload.ip | 131 ----
tests/py/inet/esp.t.payload.ip6 | 131 ----
tests/py/inet/esp.t.payload.netdev | 131 ----
tests/py/inet/ether.t.payload.ip | 6 +-
tests/py/inet/ether.t.payload.ip6 | 55 --
tests/py/inet/icmpX.t.payload | 4 +-
tests/py/inet/{ip.t.payload.ip => ip.t.payload} | 6 +-
tests/py/inet/ip.t.payload.inet | 1 +
.../py/inet/{map.t.payload.inet => map.t.payload} | 0
tests/py/inet/map.t.payload.ip | 12 +-
tests/py/inet/map.t.payload.netdev | 2 +-
.../inet/{sctp.t.payload.inet => sctp.t.payload} | 0
tests/py/inet/sctp.t.payload.ip | 276 ---------
tests/py/inet/sctp.t.payload.ip6 | 276 ---------
tests/py/inet/sctp.t.payload.netdev | 276 ---------
.../py/inet/{tcp.t.payload.inet => tcp.t.payload} | 0
tests/py/inet/tcp.t.payload.ip | 661 --------------------
tests/py/inet/tcp.t.payload.ip6 | 661 --------------------
tests/py/inet/tcp.t.payload.netdev | 669 ---------------------
.../{tcpopt.t.payload.inet => tcpopt.t.payload} | 0
.../py/inet/{udp.t.payload.inet => udp.t.payload} | 0
tests/py/inet/udp.t.payload.ip | 330 ----------
tests/py/inet/udp.t.payload.ip6 | 330 ----------
tests/py/inet/udp.t.payload.netdev | 331 ----------
.../{udplite.t.payload.inet => udplite.t.payload} | 0
tests/py/inet/udplite.t.payload.ip | 240 --------
tests/py/inet/udplite.t.payload.ip6 | 240 --------
tests/py/inet/udplite.t.payload.netdev | 240 --------
tests/py/ip/dnat.t.payload.ip | 12 +-
tests/py/ip/ether.t.payload | 6 +-
tests/py/ip/icmp.t.payload.ip | 146 ++---
tests/py/ip/masquerade.t.payload | 28 +-
tests/py/ip/objects.t.payload | 6 +-
tests/py/ip/redirect.t.payload | 44 +-
tests/py/ip/reject.t.payload | 2 +-
tests/py/ip/snat.t.payload | 10 +-
tests/py/ip/tcp.t.payload | 2 +-
tests/py/ip/tcpopt.t.payload | 52 +-
54 files changed, 174 insertions(+), 6883 deletions(-)
rename tests/py/inet/{ah.t.payload.inet => ah.t.payload} (100%)
delete mode 100644 tests/py/inet/ah.t.payload.ip
delete mode 100644 tests/py/inet/ah.t.payload.ip6
delete mode 100644 tests/py/inet/ah.t.payload.netdev
rename tests/py/inet/{comp.t.payload.inet => comp.t.payload} (100%)
delete mode 100644 tests/py/inet/comp.t.payload.ip
delete mode 100644 tests/py/inet/comp.t.payload.ip6
delete mode 100644 tests/py/inet/comp.t.payload.netdev
rename tests/py/inet/{dccp.t.payload.inet => dccp.t.payload} (100%)
delete mode 100644 tests/py/inet/dccp.t.payload.ip
delete mode 100644 tests/py/inet/dccp.t.payload.ip6
delete mode 100644 tests/py/inet/dccp.t.payload.netdev
rename tests/py/inet/{esp.t.payload.inet => esp.t.payload} (100%)
delete mode 100644 tests/py/inet/esp.t.payload.ip
delete mode 100644 tests/py/inet/esp.t.payload.ip6
delete mode 100644 tests/py/inet/esp.t.payload.netdev
delete mode 100644 tests/py/inet/ether.t.payload.ip6
rename tests/py/inet/{ip.t.payload.ip => ip.t.payload} (86%)
rename tests/py/inet/{map.t.payload.inet => map.t.payload} (100%)
rename tests/py/inet/{sctp.t.payload.inet => sctp.t.payload} (100%)
delete mode 100644 tests/py/inet/sctp.t.payload.ip
delete mode 100644 tests/py/inet/sctp.t.payload.ip6
delete mode 100644 tests/py/inet/sctp.t.payload.netdev
rename tests/py/inet/{tcp.t.payload.inet => tcp.t.payload} (100%)
delete mode 100644 tests/py/inet/tcp.t.payload.ip
delete mode 100644 tests/py/inet/tcp.t.payload.ip6
delete mode 100644 tests/py/inet/tcp.t.payload.netdev
rename tests/py/inet/{tcpopt.t.payload.inet => tcpopt.t.payload} (100%)
rename tests/py/inet/{udp.t.payload.inet => udp.t.payload} (100%)
delete mode 100644 tests/py/inet/udp.t.payload.ip
delete mode 100644 tests/py/inet/udp.t.payload.ip6
delete mode 100644 tests/py/inet/udp.t.payload.netdev
rename tests/py/inet/{udplite.t.payload.inet => udplite.t.payload} (100%)
delete mode 100644 tests/py/inet/udplite.t.payload.ip
delete mode 100644 tests/py/inet/udplite.t.payload.ip6
delete mode 100644 tests/py/inet/udplite.t.payload.netdev
diff --git a/tests/py/bridge/icmpX.t.payload b/tests/py/bridge/icmpX.t.payload
index b351f7b008b7..77e6a4fbf217 100644
--- a/tests/py/bridge/icmpX.t.payload
+++ b/tests/py/bridge/icmpX.t.payload
@@ -9,9 +9,7 @@ bridge test-bridge input
# icmp type echo-request
bridge test-bridge input
- [ payload load 2b @ link header + 12 => reg 1 ]
- [ cmp eq reg 1 0x00000008 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000008 ]
diff --git a/tests/py/bridge/vlan.t.payload b/tests/py/bridge/vlan.t.payload
index 5fce9c16cd9d..cb0e812f8ec3 100644
--- a/tests/py/bridge/vlan.t.payload
+++ b/tests/py/bridge/vlan.t.payload
@@ -134,7 +134,7 @@ bridge test-bridge input
[ payload load 4b @ network header + 12 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00feffff ) ^ 0x00000000 ]
[ cmp eq reg 1 0x0000000a ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -151,7 +151,7 @@ bridge test-bridge input
[ payload load 4b @ network header + 12 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00feffff ) ^ 0x00000000 ]
[ cmp eq reg 1 0x0000000a ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
diff --git a/tests/py/bridge/vlan.t.payload.netdev b/tests/py/bridge/vlan.t.payload.netdev
index 45ea2251c934..c57955ec7394 100644
--- a/tests/py/bridge/vlan.t.payload.netdev
+++ b/tests/py/bridge/vlan.t.payload.netdev
@@ -160,7 +160,7 @@ netdev test-netdev ingress
[ payload load 4b @ network header + 12 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00feffff ) ^ 0x00000000 ]
[ cmp eq reg 1 0x0000000a ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -179,7 +179,7 @@ netdev test-netdev ingress
[ payload load 4b @ network header + 12 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x00feffff ) ^ 0x00000000 ]
[ cmp eq reg 1 0x0000000a ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
diff --git a/tests/py/inet/ah.t.payload.inet b/tests/py/inet/ah.t.payload
similarity index 100%
rename from tests/py/inet/ah.t.payload.inet
rename to tests/py/inet/ah.t.payload
diff --git a/tests/py/inet/ah.t.payload.ip b/tests/py/inet/ah.t.payload.ip
deleted file mode 100644
index 594c949ff927..000000000000
diff --git a/tests/py/inet/ah.t.payload.ip6 b/tests/py/inet/ah.t.payload.ip6
deleted file mode 100644
index 4d5df6368da4..000000000000
diff --git a/tests/py/inet/ah.t.payload.netdev b/tests/py/inet/ah.t.payload.netdev
deleted file mode 100644
index af150969ad87..000000000000
diff --git a/tests/py/inet/comp.t.payload.inet b/tests/py/inet/comp.t.payload
similarity index 100%
rename from tests/py/inet/comp.t.payload.inet
rename to tests/py/inet/comp.t.payload
diff --git a/tests/py/inet/comp.t.payload.ip b/tests/py/inet/comp.t.payload.ip
deleted file mode 100644
index 9a6194e3bee6..000000000000
diff --git a/tests/py/inet/comp.t.payload.ip6 b/tests/py/inet/comp.t.payload.ip6
deleted file mode 100644
index 3048d822d3f7..000000000000
diff --git a/tests/py/inet/comp.t.payload.netdev b/tests/py/inet/comp.t.payload.netdev
deleted file mode 100644
index dec38aea6c5a..000000000000
diff --git a/tests/py/inet/dccp.t.payload.inet b/tests/py/inet/dccp.t.payload
similarity index 100%
rename from tests/py/inet/dccp.t.payload.inet
rename to tests/py/inet/dccp.t.payload
diff --git a/tests/py/inet/dccp.t.payload.ip b/tests/py/inet/dccp.t.payload.ip
deleted file mode 100644
index b8844c573904..000000000000
diff --git a/tests/py/inet/dccp.t.payload.ip6 b/tests/py/inet/dccp.t.payload.ip6
deleted file mode 100644
index 0fa441043a7a..000000000000
diff --git a/tests/py/inet/dccp.t.payload.netdev b/tests/py/inet/dccp.t.payload.netdev
deleted file mode 100644
index 313693163dca..000000000000
diff --git a/tests/py/inet/esp.t.payload.inet b/tests/py/inet/esp.t.payload
similarity index 100%
rename from tests/py/inet/esp.t.payload.inet
rename to tests/py/inet/esp.t.payload
diff --git a/tests/py/inet/esp.t.payload.ip b/tests/py/inet/esp.t.payload.ip
deleted file mode 100644
index f8ef9ec830f6..000000000000
diff --git a/tests/py/inet/esp.t.payload.ip6 b/tests/py/inet/esp.t.payload.ip6
deleted file mode 100644
index a9ed233c8f5d..000000000000
diff --git a/tests/py/inet/esp.t.payload.netdev b/tests/py/inet/esp.t.payload.netdev
deleted file mode 100644
index ad68530be19a..000000000000
diff --git a/tests/py/inet/ether.t.payload.ip b/tests/py/inet/ether.t.payload.ip
index 2d33f0cecbe9..196930fd8ff5 100644
--- a/tests/py/inet/ether.t.payload.ip
+++ b/tests/py/inet/ether.t.payload.ip
@@ -1,6 +1,6 @@
# tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 meta nfproto ipv4 accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
@@ -14,7 +14,7 @@ ip test-ip4 input
# tcp dport 22 iiftype ether ether saddr 00:0f:54:0c:11:4 accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
@@ -26,7 +26,7 @@ ip test-ip4 input
# tcp dport 22 ether saddr 00:0f:54:0c:11:04 accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
diff --git a/tests/py/inet/ether.t.payload.ip6 b/tests/py/inet/ether.t.payload.ip6
deleted file mode 100644
index a3a8905e6372..000000000000
diff --git a/tests/py/inet/icmpX.t.payload b/tests/py/inet/icmpX.t.payload
index 4df15d7fb28c..e951066aa0d6 100644
--- a/tests/py/inet/icmpX.t.payload
+++ b/tests/py/inet/icmpX.t.payload
@@ -9,9 +9,7 @@ inet test-inet input
# icmp type echo-request
inet test-inet input
- [ meta load nfproto => reg 1 ]
- [ cmp eq reg 1 0x00000002 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000008 ]
diff --git a/tests/py/inet/ip.t.payload.ip b/tests/py/inet/ip.t.payload
similarity index 86%
rename from tests/py/inet/ip.t.payload.ip
rename to tests/py/inet/ip.t.payload
index f0ef38bcfc33..589a5cd35a80 100644
--- a/tests/py/inet/ip.t.payload.ip
+++ b/tests/py/inet/ip.t.payload
@@ -1,8 +1,8 @@
# ip saddr . ip daddr . ether saddr { 1.1.1.1 . 2.2.2.2 . ca:fe:ca:fe:ca:fe }
-__set%d test-ip4 3
-__set%d test-ip4 0
+__set%d test-inet 3
+__set%d test-inet 0
element 01010101 02020202 fecafeca 0000feca : 0 [end]
-ip test-ip4 input
+inet test-ip input
[ meta load iiftype => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 4b @ network header + 12 => reg 1 ]
diff --git a/tests/py/inet/ip.t.payload.inet b/tests/py/inet/ip.t.payload.inet
index e926d03a8e7a..8df41defea0a 100644
--- a/tests/py/inet/ip.t.payload.inet
+++ b/tests/py/inet/ip.t.payload.inet
@@ -11,3 +11,4 @@ inet test-inet input
[ payload load 4b @ network header + 16 => reg 9 ]
[ payload load 6b @ link header + 6 => reg 10 ]
[ lookup reg 1 set __set%d ]
+
diff --git a/tests/py/inet/map.t.payload.inet b/tests/py/inet/map.t.payload
similarity index 100%
rename from tests/py/inet/map.t.payload.inet
rename to tests/py/inet/map.t.payload
diff --git a/tests/py/inet/map.t.payload.ip b/tests/py/inet/map.t.payload.ip
index dfd571d5ec45..595757496d9f 100644
--- a/tests/py/inet/map.t.payload.ip
+++ b/tests/py/inet/map.t.payload.ip
@@ -1,8 +1,8 @@
# mark set ip saddr map { 10.2.3.2 : 0x0000002a, 10.2.3.1 : 0x00000017}
-__map%d test-ip b
-__map%d test-ip 0
- element 0103020a : 00000017 0 [end] element 0203020a : 0000002a 0 [end]
-ip test-ip input
+__map%d test-ip4 b
+__map%d test-ip4 0
+ element 0203020a : 0000002a 0 [end] element 0103020a : 00000017 0 [end]
+ip test-ip4 input
[ payload load 4b @ network header + 12 => reg 1 ]
[ lookup reg 1 set __map%d dreg 1 ]
[ meta set mark with reg 1 ]
@@ -10,8 +10,8 @@ ip test-ip input
# mark set ip hdrlength map { 5 : 0x00000017, 4 : 0x00000001}
__map%d test-ip4 b
__map%d test-ip4 0
- element 00000004 : 00000001 0 [end] element 00000005 : 00000017 0 [end]
-ip test-ip4 input
+ element 00000005 : 00000017 0 [end] element 00000004 : 00000001 0 [end]
+ip test-ip4 input
[ payload load 1b @ network header + 0 => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000000f ) ^ 0x00000000 ]
[ lookup reg 1 set __map%d dreg 1 ]
diff --git a/tests/py/inet/map.t.payload.netdev b/tests/py/inet/map.t.payload.netdev
index 1457c5daa574..501fb8eec478 100644
--- a/tests/py/inet/map.t.payload.netdev
+++ b/tests/py/inet/map.t.payload.netdev
@@ -1,7 +1,7 @@
# mark set ip saddr map { 10.2.3.2 : 0x0000002a, 10.2.3.1 : 0x00000017}
__map%d test-netdev b
__map%d test-netdev 0
- element 0103020a : 00000017 0 [end] element 0203020a : 0000002a 0 [end]
+ element 0203020a : 0000002a 0 [end] element 0103020a : 00000017 0 [end]
netdev test-netdev ingress
[ meta load protocol => reg 1 ]
[ cmp eq reg 1 0x00000008 ]
diff --git a/tests/py/inet/sctp.t.payload.inet b/tests/py/inet/sctp.t.payload
similarity index 100%
rename from tests/py/inet/sctp.t.payload.inet
rename to tests/py/inet/sctp.t.payload
diff --git a/tests/py/inet/sctp.t.payload.ip b/tests/py/inet/sctp.t.payload.ip
deleted file mode 100644
index 4d8a7246fb04..000000000000
diff --git a/tests/py/inet/sctp.t.payload.ip6 b/tests/py/inet/sctp.t.payload.ip6
deleted file mode 100644
index 9775804d55ef..000000000000
diff --git a/tests/py/inet/sctp.t.payload.netdev b/tests/py/inet/sctp.t.payload.netdev
deleted file mode 100644
index ecfcc7252a06..000000000000
diff --git a/tests/py/inet/tcp.t.payload.inet b/tests/py/inet/tcp.t.payload
similarity index 100%
rename from tests/py/inet/tcp.t.payload.inet
rename to tests/py/inet/tcp.t.payload
diff --git a/tests/py/inet/tcp.t.payload.ip b/tests/py/inet/tcp.t.payload.ip
deleted file mode 100644
index 79fd500aef37..000000000000
diff --git a/tests/py/inet/tcp.t.payload.ip6 b/tests/py/inet/tcp.t.payload.ip6
deleted file mode 100644
index a335f594cbc2..000000000000
diff --git a/tests/py/inet/tcp.t.payload.netdev b/tests/py/inet/tcp.t.payload.netdev
deleted file mode 100644
index dbf4b131ea45..000000000000
diff --git a/tests/py/inet/tcpopt.t.payload.inet b/tests/py/inet/tcpopt.t.payload
similarity index 100%
rename from tests/py/inet/tcpopt.t.payload.inet
rename to tests/py/inet/tcpopt.t.payload
diff --git a/tests/py/inet/udp.t.payload.inet b/tests/py/inet/udp.t.payload
similarity index 100%
rename from tests/py/inet/udp.t.payload.inet
rename to tests/py/inet/udp.t.payload
diff --git a/tests/py/inet/udp.t.payload.ip b/tests/py/inet/udp.t.payload.ip
deleted file mode 100644
index d49fc513ab66..000000000000
diff --git a/tests/py/inet/udp.t.payload.ip6 b/tests/py/inet/udp.t.payload.ip6
deleted file mode 100644
index 8edcff4faa29..000000000000
diff --git a/tests/py/inet/udp.t.payload.netdev b/tests/py/inet/udp.t.payload.netdev
deleted file mode 100644
index ab0f51a499d8..000000000000
diff --git a/tests/py/inet/udplite.t.payload.inet b/tests/py/inet/udplite.t.payload
similarity index 100%
rename from tests/py/inet/udplite.t.payload.inet
rename to tests/py/inet/udplite.t.payload
diff --git a/tests/py/inet/udplite.t.payload.ip b/tests/py/inet/udplite.t.payload.ip
deleted file mode 100644
index c1ecc9d57e7a..000000000000
diff --git a/tests/py/inet/udplite.t.payload.ip6 b/tests/py/inet/udplite.t.payload.ip6
deleted file mode 100644
index d2f032e905e0..000000000000
diff --git a/tests/py/inet/udplite.t.payload.netdev b/tests/py/inet/udplite.t.payload.netdev
deleted file mode 100644
index 565935a27e90..000000000000
diff --git a/tests/py/ip/dnat.t.payload.ip b/tests/py/ip/dnat.t.payload.ip
index 7a7f5a82dd5a..1b869d0a002e 100644
--- a/tests/py/ip/dnat.t.payload.ip
+++ b/tests/py/ip/dnat.t.payload.ip
@@ -2,7 +2,7 @@
ip test-ip4 prerouting
[ meta load iifname => reg 1 ]
[ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00005000 ]
@@ -14,7 +14,7 @@ ip test-ip4 prerouting
ip test-ip4 prerouting
[ meta load iifname => reg 1 ]
[ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ range neq reg 1 0x00005000 0x00005a00 ]
@@ -28,7 +28,7 @@ __set%d test-ip4 0
ip test-ip4 prerouting
[ meta load iifname => reg 1 ]
[ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -42,7 +42,7 @@ __set%d test-ip4 0
ip test-ip4 prerouting
[ meta load iifname => reg 1 ]
[ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -53,7 +53,7 @@ ip test-ip4 prerouting
ip test-ip4 prerouting
[ meta load iifname => reg 1 ]
[ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ range neq reg 1 0x00001700 0x00002200 ]
@@ -64,7 +64,7 @@ ip test-ip4 prerouting
ip test-ip4 prerouting
[ meta load iifname => reg 1 ]
[ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00005100 ]
diff --git a/tests/py/ip/ether.t.payload b/tests/py/ip/ether.t.payload
index 0d234dab1a5b..bd7c8f150632 100644
--- a/tests/py/ip/ether.t.payload
+++ b/tests/py/ip/ether.t.payload
@@ -1,6 +1,6 @@
# tcp dport 22 iiftype ether ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:4 accept
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
@@ -14,7 +14,7 @@ ip test-ip input
# tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip daddr 1.2.3.4
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
@@ -27,7 +27,7 @@ ip test-ip input
# tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
diff --git a/tests/py/ip/icmp.t.payload.ip b/tests/py/ip/icmp.t.payload.ip
index 1130b9841b31..f959cf338295 100644
--- a/tests/py/ip/icmp.t.payload.ip
+++ b/tests/py/ip/icmp.t.payload.ip
@@ -1,6 +1,6 @@
# icmp type echo-reply accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000000 ]
@@ -8,7 +8,7 @@ ip test-ip4 input
# icmp type destination-unreachable accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000003 ]
@@ -16,7 +16,7 @@ ip test-ip4 input
# icmp type source-quench accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000004 ]
@@ -24,7 +24,7 @@ ip test-ip4 input
# icmp type redirect accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000005 ]
@@ -32,7 +32,7 @@ ip test-ip4 input
# icmp type echo-request accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000008 ]
@@ -40,7 +40,7 @@ ip test-ip4 input
# icmp type time-exceeded accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x0000000b ]
@@ -48,7 +48,7 @@ ip test-ip4 input
# icmp type parameter-problem accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x0000000c ]
@@ -56,7 +56,7 @@ ip test-ip4 input
# icmp type timestamp-request accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x0000000d ]
@@ -64,7 +64,7 @@ ip test-ip4 input
# icmp type timestamp-reply accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x0000000e ]
@@ -72,7 +72,7 @@ ip test-ip4 input
# icmp type info-request accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x0000000f ]
@@ -80,7 +80,7 @@ ip test-ip4 input
# icmp type info-reply accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000010 ]
@@ -88,7 +88,7 @@ ip test-ip4 input
# icmp type address-mask-request accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
@@ -96,7 +96,7 @@ ip test-ip4 input
# icmp type address-mask-reply accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000012 ]
@@ -107,7 +107,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00000000 : 0 [end] element 00000003 : 0 [end] element 00000004 : 0 [end] element 00000005 : 0 [end] element 00000008 : 0 [end] element 0000000b : 0 [end] element 0000000c : 0 [end] element 0000000d : 0 [end] element 0000000e : 0 [end] element 0000000f : 0 [end] element 00000010 : 0 [end] element 00000011 : 0 [end] element 00000012 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -118,14 +118,14 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00000000 : 0 [end] element 00000003 : 0 [end] element 00000004 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmp code 111 accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ cmp eq reg 1 0x0000006f ]
@@ -133,7 +133,7 @@ ip test-ip4 input
# icmp code != 111 accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ cmp neq reg 1 0x0000006f ]
@@ -141,7 +141,7 @@ ip test-ip4 input
# icmp code 33-55
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ cmp gte reg 1 0x00000021 ]
@@ -149,7 +149,7 @@ ip test-ip4 input
# icmp code != 33-55
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ range neq reg 1 0x00000021 0x00000037 ]
@@ -159,7 +159,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -169,7 +169,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00000021 : 0 [end] element 00000038 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -179,7 +179,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00000002 : 0 [end] element 00000004 : 0 [end] element 00000036 : 0 [end] element 00000021 : 0 [end] element 00000038 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -189,14 +189,14 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00000002 : 0 [end] element 00000004 : 0 [end] element 00000036 : 0 [end] element 00000021 : 0 [end] element 00000038 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 1 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmp checksum 12343 accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003730 ]
@@ -204,7 +204,7 @@ ip test-ip4 input
# icmp checksum != 12343 accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp neq reg 1 0x00003730 ]
@@ -212,7 +212,7 @@ ip test-ip4 input
# icmp checksum 11-343 accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00000b00 ]
@@ -221,7 +221,7 @@ ip test-ip4 input
# icmp checksum != 11-343 accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ range neq reg 1 0x00000b00 0x00005701 ]
@@ -232,7 +232,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00000b00 : 0 [end] element 00005801 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -243,7 +243,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00000b00 : 0 [end] element 00005801 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -254,7 +254,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00005704 : 0 [end] element 0000de00 : 0 [end] element 00005701 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -265,7 +265,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00005704 : 0 [end] element 0000de00 : 0 [end] element 00005701 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -273,7 +273,7 @@ ip test-ip4 input
# icmp id 1245 log
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ cmp eq reg 1 0x0000dd04 ]
@@ -281,21 +281,21 @@ ip test-ip4 input
# icmp id 22
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# icmp id != 233
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# icmp id 33-45
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -303,7 +303,7 @@ ip test-ip4 input
# icmp id != 33-45
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -313,7 +313,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -323,7 +323,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -333,7 +333,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00001600 : 0 [end] element 00002200 : 0 [end] element 00004d01 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -343,28 +343,28 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00001600 : 0 [end] element 00002200 : 0 [end] element 00004d01 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmp sequence 22
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# icmp sequence != 233
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# icmp sequence 33-45
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -372,7 +372,7 @@ ip test-ip4 input
# icmp sequence != 33-45
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -382,7 +382,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -392,7 +392,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -402,7 +402,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -412,21 +412,21 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmp mtu 33
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp eq reg 1 0x00002100 ]
# icmp mtu 22-33
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp gte reg 1 0x00001600 ]
@@ -437,7 +437,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00001600 : 0 [end] element 00002200 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -447,28 +447,28 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00001600 : 0 [end] element 00002200 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmp mtu 22
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
# icmp mtu != 233
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp neq reg 1 0x0000e900 ]
# icmp mtu 33-45
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ cmp gte reg 1 0x00002100 ]
@@ -476,7 +476,7 @@ ip test-ip4 input
# icmp mtu != 33-45
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ range neq reg 1 0x00002100 0x00002d00 ]
@@ -486,7 +486,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -496,7 +496,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00002100 : 0 [end] element 00003700 : 0 [end] element 00004300 : 0 [end] element 00005800 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -506,7 +506,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -516,28 +516,28 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 00002100 : 0 [end] element 00003800 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 2b @ transport header + 6 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmp gateway 22
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp eq reg 1 0x16000000 ]
# icmp gateway != 233
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp neq reg 1 0xe9000000 ]
# icmp gateway 33-45
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp gte reg 1 0x21000000 ]
@@ -545,7 +545,7 @@ ip test-ip4 input
# icmp gateway != 33-45
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ range neq reg 1 0x21000000 0x2d000000 ]
@@ -555,7 +555,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -565,7 +565,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 21000000 : 0 [end] element 37000000 : 0 [end] element 43000000 : 0 [end] element 58000000 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -575,7 +575,7 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -585,14 +585,14 @@ __set%d test-ip4 7
__set%d test-ip4 0
element 00000000 : 1 [end] element 21000000 : 0 [end] element 38000000 : 1 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmp gateway != 34
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ cmp neq reg 1 0x22000000 ]
@@ -602,14 +602,14 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 4d010000 : 0 [end] element 4e010000 : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 4b @ transport header + 4 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
# icmp type router-advertisement accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x00000009 ]
@@ -617,7 +617,7 @@ ip test-ip4 input
# icmp type router-solicitation accept
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ cmp eq reg 1 0x0000000a ]
@@ -628,7 +628,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00000000 : 0 [end] element 00000003 : 0 [end] element 00000004 : 0 [end] element 00000005 : 0 [end] element 00000008 : 0 [end] element 0000000b : 0 [end] element 0000000c : 0 [end] element 0000000d : 0 [end] element 0000000e : 0 [end] element 0000000f : 0 [end] element 00000010 : 0 [end] element 00000011 : 0 [end] element 00000012 : 0 [end] element 00000009 : 0 [end] element 0000000a : 0 [end]
ip test-ip4 input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
[ payload load 1b @ transport header + 0 => reg 1 ]
[ lookup reg 1 set __set%d ]
diff --git a/tests/py/ip/masquerade.t.payload b/tests/py/ip/masquerade.t.payload
index ad0ea518ed53..43ac7f70648a 100644
--- a/tests/py/ip/masquerade.t.payload
+++ b/tests/py/ip/masquerade.t.payload
@@ -1,6 +1,6 @@
# udp dport 53 masquerade
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -8,7 +8,7 @@ ip test-ip4 postrouting
# udp dport 53 masquerade random
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -16,7 +16,7 @@ ip test-ip4 postrouting
# udp dport 53 masquerade random,persistent
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -24,7 +24,7 @@ ip test-ip4 postrouting
# udp dport 53 masquerade random,persistent,fully-random
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -32,7 +32,7 @@ ip test-ip4 postrouting
# udp dport 53 masquerade random,fully-random
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -40,7 +40,7 @@ ip test-ip4 postrouting
# udp dport 53 masquerade random,fully-random,persistent
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -48,7 +48,7 @@ ip test-ip4 postrouting
# udp dport 53 masquerade persistent
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -56,7 +56,7 @@ ip test-ip4 postrouting
# udp dport 53 masquerade persistent,random
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -64,7 +64,7 @@ ip test-ip4 postrouting
# udp dport 53 masquerade persistent,random,fully-random
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -72,7 +72,7 @@ ip test-ip4 postrouting
# udp dport 53 masquerade persistent,fully-random
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -80,7 +80,7 @@ ip test-ip4 postrouting
# udp dport 53 masquerade persistent,fully-random,random
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -91,7 +91,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00000100 : 0 [end] element 00000200 : 0 [end] element 00000300 : 0 [end] element 00000400 : 0 [end] element 00000500 : 0 [end] element 00000600 : 0 [end] element 00000700 : 0 [end] element 00000800 : 0 [end] element 00006500 : 0 [end] element 0000ca00 : 0 [end] element 00002f01 : 0 [end] element 0000e903 : 0 [end] element 0000d207 : 0 [end] element 0000bb0b : 0 [end]
ip test-ip4 postrouting
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -102,7 +102,7 @@ ip test-ip4 postrouting
[ payload load 4b @ network header + 16 => reg 1 ]
[ cmp gte reg 1 0x0000000a ]
[ cmp lte reg 1 0x0403020a ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -119,7 +119,7 @@ ip test-ip4 postrouting
[ ct load state => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000000a ) ^ 0x00000000 ]
[ cmp neq reg 1 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __map%d dreg 0 ]
diff --git a/tests/py/ip/objects.t.payload b/tests/py/ip/objects.t.payload
index 6499d36348fe..7f16c5ac599e 100644
--- a/tests/py/ip/objects.t.payload
+++ b/tests/py/ip/objects.t.payload
@@ -9,7 +9,7 @@ __objmap%d test-ip4 43
__objmap%d test-ip4 0
element 0000bb01 : 0 [end] element 00005000 : 0 [end] element 00001600 : 0 [end]
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ objref sreg 1 set __objmap%d id 1 ]
@@ -25,7 +25,7 @@ __objmap%d test-ip4 43
__objmap%d test-ip4 0
element 0000bb01 : 0 [end] element 00005000 : 0 [end] element 00001600 : 0 [end]
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ objref sreg 1 set __objmap%d id 1 ]
@@ -39,7 +39,7 @@ __objmap%d test-ip4 43
__objmap%d test-ip4 0
element 00001500 : 0 [end] element 00004908 : 0 [end]
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ objref sreg 1 set __objmap%d id 1 ]
diff --git a/tests/py/ip/redirect.t.payload b/tests/py/ip/redirect.t.payload
index 1f050bfe186e..a5d0f0dc111f 100644
--- a/tests/py/ip/redirect.t.payload
+++ b/tests/py/ip/redirect.t.payload
@@ -1,6 +1,6 @@
# udp dport 53 redirect
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -8,7 +8,7 @@ ip test-ip4 output
# udp dport 53 redirect random
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -16,7 +16,7 @@ ip test-ip4 output
# udp dport 53 redirect random,persistent
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -24,7 +24,7 @@ ip test-ip4 output
# udp dport 53 redirect random,persistent,fully-random
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -32,7 +32,7 @@ ip test-ip4 output
# udp dport 53 redirect random,fully-random
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -40,7 +40,7 @@ ip test-ip4 output
# udp dport 53 redirect random,fully-random,persistent
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -48,7 +48,7 @@ ip test-ip4 output
# udp dport 53 redirect persistent
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -56,7 +56,7 @@ ip test-ip4 output
# udp dport 53 redirect persistent,random
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -64,7 +64,7 @@ ip test-ip4 output
# udp dport 53 redirect persistent,random,fully-random
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -72,7 +72,7 @@ ip test-ip4 output
# udp dport 53 redirect persistent,fully-random
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -80,7 +80,7 @@ ip test-ip4 output
# udp dport 53 redirect persistent,fully-random,random
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -88,7 +88,7 @@ ip test-ip4 output
# tcp dport 22 redirect to :22
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
@@ -97,7 +97,7 @@ ip test-ip4 output
# udp dport 1234 redirect to :4321
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000d204 ]
@@ -108,7 +108,7 @@ ip test-ip4 output
ip test-ip4 output
[ payload load 4b @ network header + 16 => reg 1 ]
[ cmp eq reg 1 0x010010ac ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00000e27 ]
@@ -117,7 +117,7 @@ ip test-ip4 output
# tcp dport 39128 redirect to :993
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000d898 ]
@@ -134,7 +134,7 @@ ip test-ip4 output
# tcp dport 9128 redirect to :993 random
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000a823 ]
@@ -143,7 +143,7 @@ ip test-ip4 output
# tcp dport 9128 redirect to :993 fully-random
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000a823 ]
@@ -152,7 +152,7 @@ ip test-ip4 output
# tcp dport 9128 redirect to :123 persistent
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000a823 ]
@@ -161,7 +161,7 @@ ip test-ip4 output
# tcp dport 9128 redirect to :123 random,persistent
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x0000a823 ]
@@ -173,7 +173,7 @@ __set%d test-ip4 3
__set%d test-ip4 0
element 00000100 : 0 [end] element 00000200 : 0 [end] element 00000300 : 0 [end] element 00000400 : 0 [end] element 00000500 : 0 [end] element 00000600 : 0 [end] element 00000700 : 0 [end] element 00000800 : 0 [end] element 00006500 : 0 [end] element 0000ca00 : 0 [end] element 00002f01 : 0 [end] element 0000e903 : 0 [end] element 0000d207 : 0 [end] element 0000bb0b : 0 [end]
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -184,7 +184,7 @@ ip test-ip4 output
[ payload load 4b @ network header + 16 => reg 1 ]
[ cmp gte reg 1 0x0000000a ]
[ cmp lte reg 1 0x0403020a ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00003500 ]
@@ -201,7 +201,7 @@ ip test-ip4 output
[ ct load state => reg 1 ]
[ bitwise reg 1 = (reg=1 & 0x0000000a ) ^ 0x00000000 ]
[ cmp neq reg 1 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __map%d dreg 0 ]
diff --git a/tests/py/ip/reject.t.payload b/tests/py/ip/reject.t.payload
index ec94b4c1a1c5..07e4cc8d71a0 100644
--- a/tests/py/ip/reject.t.payload
+++ b/tests/py/ip/reject.t.payload
@@ -32,7 +32,7 @@ ip test-ip4 output
# mark 0x80000000 reject with tcp reset
ip test-ip4 output
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ meta load mark => reg 1 ]
[ cmp eq reg 1 0x80000000 ]
diff --git a/tests/py/ip/snat.t.payload b/tests/py/ip/snat.t.payload
index 25a505c2112a..789933ffd650 100644
--- a/tests/py/ip/snat.t.payload
+++ b/tests/py/ip/snat.t.payload
@@ -2,7 +2,7 @@
ip test-ip4 postrouting
[ meta load iifname => reg 1 ]
[ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp gte reg 1 0x00005000 ]
@@ -14,7 +14,7 @@ ip test-ip4 postrouting
ip test-ip4 postrouting
[ meta load iifname => reg 1 ]
[ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ range neq reg 1 0x00005000 0x00005a00 ]
@@ -28,7 +28,7 @@ __set%d test-ip4 0
ip test-ip4 postrouting
[ meta load iifname => reg 1 ]
[ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d ]
@@ -42,7 +42,7 @@ __set%d test-ip4 0
ip test-ip4 postrouting
[ meta load iifname => reg 1 ]
[ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ lookup reg 1 set __set%d 0x1 ]
@@ -53,7 +53,7 @@ ip test-ip4 postrouting
ip test-ip4 postrouting
[ meta load iifname => reg 1 ]
[ cmp eq reg 1 0x30687465 0x00000000 0x00000000 0x00000000 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ range neq reg 1 0x00001700 0x00002200 ]
diff --git a/tests/py/ip/tcp.t.payload b/tests/py/ip/tcp.t.payload
index ed0dcc8481ee..58956d984b1b 100644
--- a/tests/py/ip/tcp.t.payload
+++ b/tests/py/ip/tcp.t.payload
@@ -10,7 +10,7 @@ ip test-ip input
ip test-ip input
[ payload load 1b @ network header + 9 => reg 1 ]
[ cmp neq reg 1 0x00000006 ]
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000011 ]
[ payload load 2b @ transport header + 2 => reg 1 ]
[ cmp eq reg 1 0x00001600 ]
diff --git a/tests/py/ip/tcpopt.t.payload b/tests/py/ip/tcpopt.t.payload
index 3e1d4ad1fcef..b2e5bdb29d1c 100644
--- a/tests/py/ip/tcpopt.t.payload
+++ b/tests/py/ip/tcpopt.t.payload
@@ -1,181 +1,181 @@
# tcp option eol kind 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 0 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option noop kind 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 1 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option maxseg kind 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 2 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option maxseg length 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 2 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option maxseg size 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 2b @ 2 + 2 => reg 1 ]
[ cmp eq reg 1 0x00000100 ]
# tcp option window kind 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 3 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option window length 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 3 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option window count 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 3 + 2 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option sack-permitted kind 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 4 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option sack-permitted length 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 4 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option sack kind 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 5 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option sack length 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 5 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option sack left 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack0 left 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 2 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack1 left 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 10 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack2 left 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 18 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack3 left 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 26 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack right 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack0 right 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 6 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack1 right 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 14 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack2 right 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 22 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option sack3 right 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 5 + 30 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option timestamp kind 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 8 + 0 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option timestamp length 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 1b @ 8 + 1 => reg 1 ]
[ cmp eq reg 1 0x00000001 ]
# tcp option timestamp tsval 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 8 + 2 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
# tcp option timestamp tsecr 1
ip test-ip input
- [ payload load 1b @ network header + 9 => reg 1 ]
+ [ meta load l4proto => reg 1 ]
[ cmp eq reg 1 0x00000006 ]
[ exthdr load tcpopt 4b @ 8 + 6 => reg 1 ]
[ cmp eq reg 1 0x01000000 ]
--
2.10.2
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH nft 01/10] src: allow update of net base w. meta l4proto icmpv6
2017-05-09 15:51 ` [PATCH nft 01/10] src: allow update of net base w. meta l4proto icmpv6 Florian Westphal
@ 2017-05-16 10:04 ` Pablo Neira Ayuso
0 siblings, 0 replies; 23+ messages in thread
From: Pablo Neira Ayuso @ 2017-05-16 10:04 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Tue, May 09, 2017 at 05:51:13PM +0200, Florian Westphal wrote:
> 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.
I would like to see a new test coming with this patch. So we can
easily relate the fix with the new test.
> Reported-by: Thomas Woerner <twoerner@redhat.com>
> Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
> src/proto.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/src/proto.c b/src/proto.c
> index 79e9dbf2b33e..fcdfbe73c735 100644
> --- a/src/proto.c
> +++ b/src/proto.c
> @@ -779,6 +779,7 @@ const struct proto_desc proto_inet_service = {
> PROTO_LINK(IPPROTO_TCP, &proto_tcp),
> PROTO_LINK(IPPROTO_DCCP, &proto_dccp),
> PROTO_LINK(IPPROTO_SCTP, &proto_sctp),
> + PROTO_LINK(IPPROTO_ICMPV6, &proto_icmp6),
> },
> .templates = {
> [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8),
> --
> 2.10.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH nft 02/10] src: ipv6: switch implicit dependencies to meta l4proto
2017-05-09 15:51 ` [PATCH nft 02/10] src: ipv6: switch implicit dependencies to meta l4proto Florian Westphal
@ 2017-05-16 10:05 ` Pablo Neira Ayuso
0 siblings, 0 replies; 23+ messages in thread
From: Pablo Neira Ayuso @ 2017-05-16 10:05 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Tue, May 09, 2017 at 05:51:14PM +0200, Florian Westphal wrote:
> when using rule like
>
> ip6 filter input tcp dport 22
> nft generates:
> [ payload load 1b @ network header + 6 => reg 1 ]
> [ cmp eq reg 1 0x00000006 ]
> [ payload load 2b @ transport header + 2 => reg 1 ]
> [ cmp eq reg 1 0x00001600 ]
>
> which is: ip6 filter input ip6 nexthdr tcp dport 22
> IOW, such a rule won't match if e.g. a fragment header is in place.
>
> This changes ip6_proto to use 'meta l4proto' which is the protocol header
> found by exthdr walk.
>
> A side effect is that for bridge we get a shorter dependency chain as it
> no longer needs to prepend 'ether proto ipv6' for old 'ip6 nexthdr' dep.
Same comment regarding tests, I would prefer to see tests are amended
in this patch too.
> Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
> ---
> src/proto.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/proto.c b/src/proto.c
> index fcdfbe73c735..3b20a5fd35b1 100644
> --- a/src/proto.c
> +++ b/src/proto.c
> @@ -707,7 +707,6 @@ const struct proto_desc proto_icmp6 = {
> const struct proto_desc proto_ip6 = {
> .name = "ip6",
> .base = PROTO_BASE_NETWORK_HDR,
> - .protocol_key = IP6HDR_NEXTHDR,
> .protocols = {
> PROTO_LINK(IPPROTO_ESP, &proto_esp),
> PROTO_LINK(IPPROTO_AH, &proto_ah),
> @@ -720,6 +719,7 @@ const struct proto_desc proto_ip6 = {
> PROTO_LINK(IPPROTO_ICMPV6, &proto_icmp6),
> },
> .templates = {
> + [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8),
> [IP6HDR_VERSION] = HDR_BITFIELD("version", &integer_type, 0, 4),
> [IP6HDR_DSCP] = HDR_BITFIELD("dscp", &dscp_type, 4, 6),
> [IP6HDR_ECN] = HDR_BITFIELD("ecn", &ecn_type, 10, 2),
> --
> 2.10.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH nft 04/10] tests: fix up meta l4proto change for ip6 family
2017-05-09 15:51 ` [PATCH nft 04/10] tests: fix up meta l4proto change for ip6 family Florian Westphal
@ 2017-05-16 10:22 ` Pablo Neira Ayuso
2017-05-16 10:52 ` Florian Westphal
0 siblings, 1 reply; 23+ messages in thread
From: Pablo Neira Ayuso @ 2017-05-16 10:22 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Tue, May 09, 2017 at 05:51:16PM +0200, Florian Westphal wrote:
> 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>
> ---
> tests/py/bridge/icmpX.t.payload | 4 +-
> tests/py/inet/ah.t.payload.ip6 | 60 +++++++-------
> tests/py/inet/comp.t.payload.ip6 | 34 ++++----
> tests/py/inet/dccp.t.payload.ip6 | 36 ++++----
> tests/py/inet/esp.t.payload.ip6 | 30 +++----
> tests/py/inet/ether.t.payload.ip6 | 6 +-
> tests/py/inet/icmpX.t.payload | 4 +-
> tests/py/inet/sctp.t.payload.ip6 | 64 +++++++-------
> tests/py/inet/tcp.t.payload.ip6 | 152 +++++++++++++++++-----------------
> tests/py/inet/udp.t.payload.ip6 | 72 ++++++++--------
> tests/py/inet/udplite.t.payload.ip6 | 52 ++++++------
> tests/py/ip6/dnat.t.payload.ip6 | 6 +-
> tests/py/ip6/ether.t.payload | 6 +-
> tests/py/ip6/icmpv6.t.payload.ip6 | 132 ++++++++++++++---------------
> tests/py/ip6/masquerade.t.payload.ip6 | 28 +++----
> tests/py/ip6/redirect.t.payload.ip6 | 38 ++++-----
> tests/py/ip6/reject.t.payload.ip6 | 2 +-
> tests/py/ip6/snat.t.payload.ip6 | 4 +-
> tests/py/ip6/tcpopt.t.payload | 52 ++++++------
> 19 files changed, 389 insertions(+), 393 deletions(-)
>
> diff --git a/tests/py/bridge/icmpX.t.payload b/tests/py/bridge/icmpX.t.payload
> index 19efdd85c43b..b351f7b008b7 100644
> --- a/tests/py/bridge/icmpX.t.payload
> +++ b/tests/py/bridge/icmpX.t.payload
> @@ -27,9 +27,7 @@ bridge test-bridge input
>
> # icmpv6 type echo-request
> 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 ]
I think this is not correct.
Before this patch, we restricted this to match on IPv6 traffic.
Now, we can match an IPv4 packet carrying an ICMPv6 protocol, this is
obviously handcrafted (incorrect) packet, but this rule would match.
So I think the implicit check for IPv6 via ethertype should still
remain there, right?
What patch are these test updates related to? Is it 1/10?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH nft 03/10] src: treat ip6 nexthdr as a protocol
2017-05-09 15:51 ` [PATCH nft 03/10] src: treat ip6 nexthdr as a protocol Florian Westphal
@ 2017-05-16 10:28 ` Pablo Neira Ayuso
0 siblings, 0 replies; 23+ messages in thread
From: Pablo Neira Ayuso @ 2017-05-16 10:28 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Tue, May 09, 2017 at 05:51:15PM +0200, Florian Westphal wrote:
> ip6 nexthdr tcp tcp dport 22
> will now inject a (useless) meta l4 dependency as ip6 nexthdr is no
> longer flagged as EXPR_F_PROTOCOL.
>
> Avoid this if user really specified a test for ip6hdr->nexthdr.
But ipv6_find_hdr() is actually fetching the layer 4 protocol number
from the fragment.
Shouldn't we do the same with ip4h->protocol to keep things
consistent? I mean, no meta l4 dependency but just real check for this
header field if specified.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH nft 07/10] tests: add ip reject with tcp and check for mark too
2017-05-09 15:51 ` [PATCH nft 07/10] tests: add ip reject with tcp and check for mark too Florian Westphal
@ 2017-05-16 10:29 ` Pablo Neira Ayuso
2017-05-16 10:40 ` Florian Westphal
0 siblings, 1 reply; 23+ messages in thread
From: Pablo Neira Ayuso @ 2017-05-16 10:29 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Tue, May 09, 2017 at 05:51:19PM +0200, Florian Westphal wrote:
> ... to avoid resetting e.g. the ssh session to the vm that runs
> nft-test.py.
Oh, this is breaking your testbed, right? OK, that's fine.
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> tests/py/bridge/reject.t | 2 +-
> tests/py/bridge/reject.t.payload | 4 +++-
> tests/py/inet/reject.t | 2 +-
> tests/py/inet/reject.t.payload.inet | 4 +++-
> tests/py/ip/reject.t | 1 +
> tests/py/ip/reject.t.payload | 8 ++++++++
> tests/py/ip6/reject.t | 2 +-
> tests/py/ip6/reject.t.payload.ip6 | 4 +++-
> 8 files changed, 21 insertions(+), 6 deletions(-)
>
> diff --git a/tests/py/bridge/reject.t b/tests/py/bridge/reject.t
> index 4fa6ac0b3278..67deac8d3b5e 100644
> --- a/tests/py/bridge/reject.t
> +++ b/tests/py/bridge/reject.t
> @@ -16,7 +16,7 @@ reject with icmpv6 type admin-prohibited;ok;ether type ip6 reject with icmpv6 ty
> reject with icmpv6 type addr-unreachable;ok;ether type ip6 reject with icmpv6 type addr-unreachable
> reject with icmpv6 type port-unreachable;ok;ether type ip6 reject
>
> -ip protocol tcp reject with tcp reset;ok;ip protocol 6 reject with tcp reset
> +mark 12345 ip protocol tcp reject with tcp reset;ok;mark 0x00003039 ip protocol 6 reject with tcp reset
>
> reject;ok
> ether type ip reject;ok
> diff --git a/tests/py/bridge/reject.t.payload b/tests/py/bridge/reject.t.payload
> index f5a0e6a82963..b984f6f8de4d 100644
> --- a/tests/py/bridge/reject.t.payload
> +++ b/tests/py/bridge/reject.t.payload
> @@ -64,8 +64,10 @@ bridge test-bridge input
> [ cmp eq reg 1 0x0000dd86 ]
> [ reject type 0 code 4 ]
>
> -# ip protocol tcp reject with tcp reset
> +# mark 12345 ip protocol tcp reject with tcp reset
> bridge test-bridge input
> + [ meta load mark => reg 1 ]
> + [ cmp eq reg 1 0x00003039 ]
> [ payload load 2b @ link header + 12 => reg 1 ]
> [ cmp eq reg 1 0x00000008 ]
> [ payload load 1b @ network header + 9 => reg 1 ]
> diff --git a/tests/py/inet/reject.t b/tests/py/inet/reject.t
> index 638f329cf4d5..7679407e6f8d 100644
> --- a/tests/py/inet/reject.t
> +++ b/tests/py/inet/reject.t
> @@ -16,7 +16,7 @@ reject with icmpv6 type admin-prohibited;ok;meta nfproto ipv6 reject with icmpv6
> reject with icmpv6 type addr-unreachable;ok;meta nfproto ipv6 reject with icmpv6 type addr-unreachable
> reject with icmpv6 type port-unreachable;ok;meta nfproto ipv6 reject
>
> -reject with tcp reset;ok;meta l4proto 6 reject with tcp reset
> +mark 12345 reject with tcp reset;ok;meta l4proto 6 mark 0x00003039 reject with tcp reset
>
> reject;ok
> meta nfproto ipv4 reject;ok
> diff --git a/tests/py/inet/reject.t.payload.inet b/tests/py/inet/reject.t.payload.inet
> index 5770330d9072..7a6468e81f9e 100644
> --- a/tests/py/inet/reject.t.payload.inet
> +++ b/tests/py/inet/reject.t.payload.inet
> @@ -64,10 +64,12 @@ inet test-inet input
> [ cmp eq reg 1 0x0000000a ]
> [ reject type 0 code 4 ]
>
> -# reject with tcp reset
> +# mark 12345 reject with tcp reset
> inet test-inet input
> [ meta load l4proto => reg 1 ]
> [ cmp eq reg 1 0x00000006 ]
> + [ meta load mark => reg 1 ]
> + [ cmp eq reg 1 0x00003039 ]
> [ reject type 1 code 0 ]
>
> # reject
> diff --git a/tests/py/ip/reject.t b/tests/py/ip/reject.t
> index 6006f0541cb8..7befe697fa23 100644
> --- a/tests/py/ip/reject.t
> +++ b/tests/py/ip/reject.t
> @@ -10,6 +10,7 @@ reject with icmp type port-unreachable;ok;reject
> reject with icmp type net-prohibited;ok
> reject with icmp type host-prohibited;ok
> reject with icmp type admin-prohibited;ok
> +mark 0x80000000 reject with tcp reset;ok
>
> reject with icmp type no-route;fail
> reject with icmpv6 type no-route;fail
> diff --git a/tests/py/ip/reject.t.payload b/tests/py/ip/reject.t.payload
> index d5e87665ebc5..ec94b4c1a1c5 100644
> --- a/tests/py/ip/reject.t.payload
> +++ b/tests/py/ip/reject.t.payload
> @@ -30,3 +30,11 @@ ip test-ip4 output
> ip test-ip4 output
> [ reject type 0 code 13 ]
>
> +# mark 0x80000000 reject with tcp reset
> +ip test-ip4 output
> + [ payload load 1b @ network header + 9 => reg 1 ]
> + [ cmp eq reg 1 0x00000006 ]
> + [ meta load mark => reg 1 ]
> + [ cmp eq reg 1 0x80000000 ]
> + [ reject type 1 code 0 ]
> +
> diff --git a/tests/py/ip6/reject.t b/tests/py/ip6/reject.t
> index de09fd978418..a95f2e3fe14a 100644
> --- a/tests/py/ip6/reject.t
> +++ b/tests/py/ip6/reject.t
> @@ -9,7 +9,7 @@ reject with icmpv6 type addr-unreachable;ok
> reject with icmpv6 type port-unreachable;ok;reject
> reject with icmpv6 type policy-fail;ok
> reject with icmpv6 type reject-route;ok
> -reject with tcp reset;ok
> +mark 0x80000000 reject with tcp reset;ok
>
> reject with icmpv6 type host-unreachable;fail
> reject with icmp type host-unreachable;fail
> diff --git a/tests/py/ip6/reject.t.payload.ip6 b/tests/py/ip6/reject.t.payload.ip6
> index 0ba5f7ee5bfd..dd4491ae47a8 100644
> --- a/tests/py/ip6/reject.t.payload.ip6
> +++ b/tests/py/ip6/reject.t.payload.ip6
> @@ -26,9 +26,11 @@ ip6 test-ip6 output
> ip6 test-ip6 output
> [ reject type 0 code 6 ]
>
> -# reject with tcp reset
> +# mark 0x80000000 reject with tcp reset
> ip6 test-ip6 output
> [ meta load l4proto => reg 1 ]
> [ cmp eq reg 1 0x00000006 ]
> + [ meta load mark => reg 1 ]
> + [ cmp eq reg 1 0x80000000 ]
> [ reject type 1 code 0 ]
>
> --
> 2.10.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH nft 09/10] src: ip: switch implicit dependencies to meta l4proto too
2017-05-09 15:51 ` [PATCH nft 09/10] src: ip: switch implicit dependencies to meta l4proto too Florian Westphal
@ 2017-05-16 10:35 ` Pablo Neira Ayuso
0 siblings, 0 replies; 23+ messages in thread
From: Pablo Neira Ayuso @ 2017-05-16 10:35 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Tue, May 09, 2017 at 05:51:21PM +0200, Florian Westphal wrote:
> after ip6 nexthdr also switch ip to meta l4proto instead of ip protocol.
>
> While its needed for ipv6 (due to extension headers) this isn't needed
> for ip but it has the advantage that
>
> tcp dport 22
>
> produces same expressions for ip/ip6/inet families.
Oh, this is coming later on... which is what I was asking before,
patch order in this series is a bit confusing for review.
Another comment below.
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> src/payload.c | 17 +++++++++++------
> src/proto.c | 3 ++-
> 2 files changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/src/payload.c b/src/payload.c
> index 3a3fe8de97cf..5331b5832fd2 100644
> --- a/src/payload.c
> +++ b/src/payload.c
> @@ -118,17 +118,22 @@ static const struct expr_ops payload_expr_ops = {
> };
>
> /*
> - * ipv6 is special case, we normally use 'meta l4proto' to fetch the last
> - * l4 header of the ipv6 extension header chain so we will also match
> + * We normally use 'meta l4proto' to fetch the last l4 header of the
> + * ipv6 extension header chain so we will also match
> * tcp after a fragmentation header, for instance.
> + * For consistency we also use meta l4proto for ipv4.
> *
> - * If user specifically asks for nexthdr x, treat is as a full
> - * dependency rather than injecting another (useless) meta l4 one.
> + * If user specifically asks for nexthdr x, don't add another (useless)
> + * meta dependency.
> */
> static bool proto_key_is_protocol(const struct proto_desc *desc, unsigned int type)
> {
> - if (type == desc->protocol_key ||
> - (desc == &proto_ip6 && type == IP6HDR_NEXTHDR))
> + if (type == desc->protocol_key)
> + return true;
> +
> + if (desc == &proto_ip6 && type == IP6HDR_NEXTHDR)
> + return true;
> + if (desc == &proto_ip && type == IPHDR_PROTOCOL)
> return true;
>
> return false;
> diff --git a/src/proto.c b/src/proto.c
> index 3b20a5fd35b1..2afedf773045 100644
> --- a/src/proto.c
> +++ b/src/proto.c
> @@ -587,7 +587,6 @@ const struct proto_desc proto_ip = {
> .name = "ip",
> .base = PROTO_BASE_NETWORK_HDR,
> .checksum_key = IPHDR_CHECKSUM,
> - .protocol_key = IPHDR_PROTOCOL,
> .protocols = {
> PROTO_LINK(IPPROTO_ICMP, &proto_icmp),
> PROTO_LINK(IPPROTO_ESP, &proto_esp),
> @@ -600,6 +599,7 @@ const struct proto_desc proto_ip = {
> PROTO_LINK(IPPROTO_SCTP, &proto_sctp),
> },
> .templates = {
> + [0] = PROTO_META_TEMPLATE("l4proto", &inet_protocol_type, NFT_META_L4PROTO, 8),
> [IPHDR_VERSION] = HDR_BITFIELD("version", &integer_type, 0, 4),
> [IPHDR_HDRLENGTH] = HDR_BITFIELD("hdrlength", &integer_type, 4, 4),
> [IPHDR_DSCP] = HDR_BITFIELD("dscp", &dscp_type, 8, 6),
> @@ -779,6 +779,7 @@ const struct proto_desc proto_inet_service = {
> PROTO_LINK(IPPROTO_TCP, &proto_tcp),
> PROTO_LINK(IPPROTO_DCCP, &proto_dccp),
> PROTO_LINK(IPPROTO_SCTP, &proto_sctp),
> + PROTO_LINK(IPPROTO_ICMP, &proto_icmp),
> PROTO_LINK(IPPROTO_ICMPV6, &proto_icmp6),
We have avoid adding ICMPv4 and ICMPv6 to proto_inet_service because
of combinations like, IPv4 packet with ICMPv6 protocol should not
match. Same with IPv6 packet with ICMPv4 protocol.
So Arturo came up with the patch to solve this:
commit 0011985554e269e1cc8f8e5b41eb9dcd795ebe8c
Author: Arturo Borrero Gonzalez <arturo@debian.org>
Date: Wed Jan 25 12:51:08 2017 +0100
payload: explicit network ctx assignment for icmp/icmp6 in special families
My concern here is that we should not match this invalid combination
to allow fishy packets go through.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH nft 07/10] tests: add ip reject with tcp and check for mark too
2017-05-16 10:29 ` Pablo Neira Ayuso
@ 2017-05-16 10:40 ` Florian Westphal
0 siblings, 0 replies; 23+ messages in thread
From: Florian Westphal @ 2017-05-16 10:40 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Florian Westphal, netfilter-devel
Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> On Tue, May 09, 2017 at 05:51:19PM +0200, Florian Westphal wrote:
> > ... to avoid resetting e.g. the ssh session to the vm that runs
> > nft-test.py.
>
> Oh, this is breaking your testbed, right? OK, that's fine.
Yes, the ssh session gets re-set during these tests.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH nft 04/10] tests: fix up meta l4proto change for ip6 family
2017-05-16 10:22 ` Pablo Neira Ayuso
@ 2017-05-16 10:52 ` Florian Westphal
2017-05-17 18:13 ` Pablo Neira Ayuso
0 siblings, 1 reply; 23+ messages in thread
From: Florian Westphal @ 2017-05-16 10:52 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Florian Westphal, netfilter-devel
Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> On Tue, May 09, 2017 at 05:51:16PM +0200, Florian Westphal wrote:
> > 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>
[..]
> > # icmpv6 type echo-request
> > 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 ]
>
> I think this is not correct.
>
> Before this patch, we restricted this to match on IPv6 traffic.
Right.
> Now, we can match an IPv4 packet carrying an ICMPv6 protocol, this is
> obviously handcrafted (incorrect) packet, but this rule would match.
Yes. I am not sure what the correct or desired behaviour is.
Simply speaking we're asked to check if transport protocol is 58, and
thats what this does.
If you prefer special-casing this I can look into it, probably
best thing is to inject 'meta nfproto ip6' test.
What would you expect in these cases (note, ip family):
a) add rule filter input meta l4proto icmpv6
b) add rule filter input meta l4proto icmpv6 icmpv6 type echo-request
c) add rule filter input icmpv6 type echo-request
with master only a) is accepted.
With patch #1 of the series, b) is also accepted.
> So I think the implicit check for IPv6 via ethertype should still
> remain there, right?
Maybe, I am not sure.
> What patch are these test updates related to? Is it 1/10?
2 and 3 (mainly 2, patch 3 gets rid of useless extra dependency,
so fixing this up after 2 means I need another fixup patch after 3).
If you prefer that I can do this, no problem.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH nft 04/10] tests: fix up meta l4proto change for ip6 family
2017-05-16 10:52 ` Florian Westphal
@ 2017-05-17 18:13 ` Pablo Neira Ayuso
2017-05-17 18:36 ` Florian Westphal
0 siblings, 1 reply; 23+ messages in thread
From: Pablo Neira Ayuso @ 2017-05-17 18:13 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
Hi Florian,
On Tue, May 16, 2017 at 12:52:21PM +0200, Florian Westphal wrote:
> Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > On Tue, May 09, 2017 at 05:51:16PM +0200, Florian Westphal wrote:
> > > 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>
>
> [..]
> > > # icmpv6 type echo-request
> > > 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 ]
> >
> > I think this is not correct.
> >
> > Before this patch, we restricted this to match on IPv6 traffic.
>
> Right.
>
> > Now, we can match an IPv4 packet carrying an ICMPv6 protocol, this is
> > obviously handcrafted (incorrect) packet, but this rule would match.
>
> Yes. I am not sure what the correct or desired behaviour is.
>
> Simply speaking we're asked to check if transport protocol is 58, and
> thats what this does.
Right. However, this forces users to add explicit ip6 nexthdr or meta
protocol to restrict this IPv6. My concern here is that this loose
matching, for something that from a protocol perspective is incorrect.
> If you prefer special-casing this I can look into it, probably
> best thing is to inject 'meta nfproto ip6' test.
For inet, yes. For bridge and netdev families the dependency would be
different.
I suspect this is working now with your patches to use meta for the
implicit dependencies. I would point to the patch that adds icmp and
icmpv6 as protocol to proto_inet_service as the one removing this
special casing.
> What would you expect in these cases (note, ip family):
>
> a) add rule filter input meta l4proto icmpv6
> b) add rule filter input meta l4proto icmpv6 icmpv6 type echo-request
> c) add rule filter input icmpv6 type echo-request
>
> with master only a) is accepted.
> With patch #1 of the series, b) is also accepted.
b) and c) are equivalent. Since c) should generate both the meta
protocol and the meta l4proto dependency.
Then, we should allow this too:
meta protocol ip meta l4proto icmpv6
so we can match IPv4 packets that container ICMPv6 packet. I know,
this is crazy, but we should users to match this. A handcrafted packet
may look like that.
I think this logic should be placed somewhere at payload_gen_dependency().
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH nft 04/10] tests: fix up meta l4proto change for ip6 family
2017-05-17 18:13 ` Pablo Neira Ayuso
@ 2017-05-17 18:36 ` Florian Westphal
2017-05-17 18:49 ` Pablo Neira Ayuso
0 siblings, 1 reply; 23+ messages in thread
From: Florian Westphal @ 2017-05-17 18:36 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Florian Westphal, netfilter-devel
Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > What would you expect in these cases (note, ip family):
> >
> > a) add rule filter input meta l4proto icmpv6
> > b) add rule filter input meta l4proto icmpv6 icmpv6 type echo-request
> > c) add rule filter input icmpv6 type echo-request
> >
> > with master only a) is accepted.
> > With patch #1 of the series, b) is also accepted.
>
> b) and c) are equivalent. Since c) should generate both the meta
> protocol and the meta l4proto dependency.
Hmm. I suspect you mean c) should be rejected?
(ip family!), so user would have to specify
> Then, we should allow this too:
>
> meta protocol ip meta l4proto icmpv6
Explicitly to indicate ip->protocol == 58 is asked for.
> so we can match IPv4 packets that container ICMPv6 packet. I know,
> this is crazy, but we should users to match this. A handcrafted packet
> may look like that.
Yes and yeas.
> I think this logic should be placed somewhere at payload_gen_dependency().
Ok, I will rework this series accordingly, i.e.:
add rule filter input icmpv6 type echo-request
will:
- pull in meta l4proto dependency for ip6 family
- pull in meta l4proto dependency PLUS ipv6 dependency in
inet/bridge/netdev families
- fail with invalid protocol base error in ip family
the last case should work in ip family iff user specifies
the nexthdr value specifically.
Does that seem ok to you?
Thanks,
Florian
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH nft 04/10] tests: fix up meta l4proto change for ip6 family
2017-05-17 18:36 ` Florian Westphal
@ 2017-05-17 18:49 ` Pablo Neira Ayuso
2017-05-17 20:55 ` Florian Westphal
0 siblings, 1 reply; 23+ messages in thread
From: Pablo Neira Ayuso @ 2017-05-17 18:49 UTC (permalink / raw)
To: Florian Westphal; +Cc: netfilter-devel
On Wed, May 17, 2017 at 08:36:53PM +0200, Florian Westphal wrote:
> Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > > What would you expect in these cases (note, ip family):
> > >
> > > a) add rule filter input meta l4proto icmpv6
> > > b) add rule filter input meta l4proto icmpv6 icmpv6 type echo-request
> > > c) add rule filter input icmpv6 type echo-request
> > >
> > > with master only a) is accepted.
> > > With patch #1 of the series, b) is also accepted.
> >
> > b) and c) are equivalent. Since c) should generate both the meta
> > protocol and the meta l4proto dependency.
>
> Hmm. I suspect you mean c) should be rejected?
> (ip family!), so user would have to specify
Oh, I thought these examples above are inet.
Yes, we should reject this from ip family.
> > Then, we should allow this too:
> >
> > meta protocol ip meta l4proto icmpv6
>
> Explicitly to indicate ip->protocol == 58 is asked for.
Exactly.
> > so we can match IPv4 packets that container ICMPv6 packet. I know,
> > this is crazy, but we should users to match this. A handcrafted packet
> > may look like that.
>
> Yes and yeas.
>
> > I think this logic should be placed somewhere at payload_gen_dependency().
>
> Ok, I will rework this series accordingly, i.e.:
>
> add rule filter input icmpv6 type echo-request
This above should be ip6 family, right?
> will:
> - pull in meta l4proto dependency for ip6 family
> - pull in meta l4proto dependency PLUS ipv6 dependency in
> inet/bridge/netdev families
> - fail with invalid protocol base error in ip family
>
> the last case should work in ip family iff user specifies
> the nexthdr value specifically.
>
> Does that seem ok to you?
Sounds great, thanks.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH nft 04/10] tests: fix up meta l4proto change for ip6 family
2017-05-17 18:49 ` Pablo Neira Ayuso
@ 2017-05-17 20:55 ` Florian Westphal
0 siblings, 0 replies; 23+ messages in thread
From: Florian Westphal @ 2017-05-17 20:55 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Florian Westphal, netfilter-devel
Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> On Wed, May 17, 2017 at 08:36:53PM +0200, Florian Westphal wrote:
> > Pablo Neira Ayuso <pablo@netfilter.org> wrote:
> > > > What would you expect in these cases (note, ip family):
> > > >
> > > > a) add rule filter input meta l4proto icmpv6
> > > > b) add rule filter input meta l4proto icmpv6 icmpv6 type echo-request
> > > > c) add rule filter input icmpv6 type echo-request
> > > >
> > > > with master only a) is accepted.
> > > > With patch #1 of the series, b) is also accepted.
> > >
> > > b) and c) are equivalent. Since c) should generate both the meta
> > > protocol and the meta l4proto dependency.
> >
> > Hmm. I suspect you mean c) should be rejected?
> > (ip family!), so user would have to specify
>
> Oh, I thought these examples above are inet.
>
> Yes, we should reject this from ip family.
>
> > > Then, we should allow this too:
> > >
> > > meta protocol ip meta l4proto icmpv6
> >
> > Explicitly to indicate ip->protocol == 58 is asked for.
>
> Exactly.
>
> > > so we can match IPv4 packets that container ICMPv6 packet. I know,
> > > this is crazy, but we should users to match this. A handcrafted packet
> > > may look like that.
> >
> > Yes and yeas.
> >
> > > I think this logic should be placed somewhere at payload_gen_dependency().
> >
> > Ok, I will rework this series accordingly, i.e.:
> >
> > add rule filter input icmpv6 type echo-request
>
> This above should be ip6 family, right?
Actually i meant
add rule $family filter input icmpv6 type echo-request
... to have the example below illustrate the difference
in behaviour and dependency injection.
> > will:
> > - pull in meta l4proto dependency for ip6 family
> > - pull in meta l4proto dependency PLUS ipv6 dependency in
> > inet/bridge/netdev families
> > - fail with invalid protocol base error in ip family
> >
> > the last case should work in ip family iff user specifies
> > the nexthdr value specifically.
> >
> > Does that seem ok to you?
>
> Sounds great, thanks.
Good, I will work on this tomorrow then.
I won't push any of the patches for the time being, so expect a v2.
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2017-05-17 20:56 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-09 15:51 [PATCH nft 00/10] switch l4 dependency to meta l4proto Florian Westphal
2017-05-09 15:51 ` [PATCH nft 01/10] src: allow update of net base w. meta l4proto icmpv6 Florian Westphal
2017-05-16 10:04 ` Pablo Neira Ayuso
2017-05-09 15:51 ` [PATCH nft 02/10] src: ipv6: switch implicit dependencies to meta l4proto Florian Westphal
2017-05-16 10:05 ` Pablo Neira Ayuso
2017-05-09 15:51 ` [PATCH nft 03/10] src: treat ip6 nexthdr as a protocol Florian Westphal
2017-05-16 10:28 ` Pablo Neira Ayuso
2017-05-09 15:51 ` [PATCH nft 04/10] tests: fix up meta l4proto change for ip6 family Florian Westphal
2017-05-16 10:22 ` Pablo Neira Ayuso
2017-05-16 10:52 ` Florian Westphal
2017-05-17 18:13 ` Pablo Neira Ayuso
2017-05-17 18:36 ` Florian Westphal
2017-05-17 18:49 ` Pablo Neira Ayuso
2017-05-17 20:55 ` Florian Westphal
2017-05-09 15:51 ` [PATCH nft 05/10] tests: meta: add icmpv6 test case Florian Westphal
2017-05-09 15:51 ` [PATCH nft 06/10] netlink_delinearize: reject: remove dependency for tcp-resets Florian Westphal
2017-05-09 15:51 ` [PATCH nft 07/10] tests: add ip reject with tcp and check for mark too Florian Westphal
2017-05-16 10:29 ` Pablo Neira Ayuso
2017-05-16 10:40 ` Florian Westphal
2017-05-09 15:51 ` [PATCH nft 08/10] src: add a comment wrt. reject dependency insertion Florian Westphal
2017-05-09 15:51 ` [PATCH nft 09/10] src: ip: switch implicit dependencies to meta l4proto too Florian Westphal
2017-05-16 10:35 ` Pablo Neira Ayuso
2017-05-09 15:51 ` [PATCH nft 10/10] tests: fix up meta l4proto change for ip family Florian Westphal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).