diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2025-02-17 10:23:24 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2025-02-21 23:23:16 +0100 |
| commit | 50741c52fe57fd09fa9cbd1a1626bfdd2f4115d8 (patch) | |
| tree | a646a07e43d8f6de2ccec8b4d5ed4c5954618fdc /tests/py/ip6/frag.t.payload.netdev | |
| parent | 347039f64509e77ad5f6ef52ae70950c91886f8e (diff) | |
netlink_linearize: use range expression for OP_EQ and OP_IMPLICIT
range expression is available since v4.9-rc1~127^2~67^2~3, replace the
two cmp expression when generating netlink bytecode.
Code to delinearize the two cmp expressions to represent the range
remains in place for backwards compatibility.
The delinearize path to parse range expressions with NFT_OP_EQ is
already present since:
3ed932917cc7 ("src: use new range expression for != [a,b] intervals")
Update tests/py payload accordingly, json tests need no update since
they already use the range to represent them.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/py/ip6/frag.t.payload.netdev')
| -rw-r--r-- | tests/py/ip6/frag.t.payload.netdev | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/py/ip6/frag.t.payload.netdev b/tests/py/ip6/frag.t.payload.netdev index 05620754..68257f5b 100644 --- a/tests/py/ip6/frag.t.payload.netdev +++ b/tests/py/ip6/frag.t.payload.netdev @@ -65,8 +65,7 @@ netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x0000dd86 ] [ exthdr load ipv6 1b @ 44 + 1 => reg 1 ] - [ cmp gte reg 1 0x00000021 ] - [ cmp lte reg 1 0x0000002d ] + [ range eq reg 1 0x00000021 0x0000002d ] # frag reserved != 33-45 netdev test-netdev ingress @@ -117,8 +116,7 @@ netdev test-netdev ingress [ cmp eq reg 1 0x0000dd86 ] [ exthdr load ipv6 2b @ 44 + 2 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x0000f8ff ) ^ 0x00000000 ] - [ cmp gte reg 1 0x00000801 ] - [ cmp lte reg 1 0x00006801 ] + [ range eq reg 1 0x00000801 0x00006801 ] # frag frag-off != 33-45 netdev test-netdev ingress @@ -200,8 +198,7 @@ netdev test-netdev ingress [ meta load protocol => reg 1 ] [ cmp eq reg 1 0x0000dd86 ] [ exthdr load ipv6 4b @ 44 + 4 => reg 1 ] - [ cmp gte reg 1 0x21000000 ] - [ cmp lte reg 1 0x2d000000 ] + [ range eq reg 1 0x21000000 0x2d000000 ] # frag id != 33-45 netdev test-netdev ingress |