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/bridge | |
| 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/bridge')
| -rw-r--r-- | tests/py/bridge/vlan.t.payload | 3 | ||||
| -rw-r--r-- | tests/py/bridge/vlan.t.payload.netdev | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/py/bridge/vlan.t.payload b/tests/py/bridge/vlan.t.payload index 2592bb96..0144a9a5 100644 --- a/tests/py/bridge/vlan.t.payload +++ b/tests/py/bridge/vlan.t.payload @@ -207,8 +207,7 @@ bridge test-bridge input [ lookup reg 1 set __set%d ] [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x000000e0 ) ^ 0x00000000 ] - [ cmp gte reg 1 0x00000020 ] - [ cmp lte reg 1 0x00000060 ] + [ range eq reg 1 0x00000020 0x00000060 ] # ether type vlan ip protocol 1 accept bridge test-bridge input diff --git a/tests/py/bridge/vlan.t.payload.netdev b/tests/py/bridge/vlan.t.payload.netdev index f3341947..330fb4a3 100644 --- a/tests/py/bridge/vlan.t.payload.netdev +++ b/tests/py/bridge/vlan.t.payload.netdev @@ -243,8 +243,7 @@ netdev test-netdev ingress [ lookup reg 1 set __set%d ] [ payload load 1b @ link header + 14 => reg 1 ] [ bitwise reg 1 = ( reg 1 & 0x000000e0 ) ^ 0x00000000 ] - [ cmp gte reg 1 0x00000020 ] - [ cmp lte reg 1 0x00000060 ] + [ range eq reg 1 0x00000020 0x00000060 ] # ether type vlan ip protocol 1 accept netdev test-netdev ingress |