diff options
| author | Florian Westphal <fw@strlen.de> | 2016-03-07 18:28:33 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2016-03-10 14:08:40 +0100 |
| commit | 4a68e3f4157982e2a3423ae2ddea1e44e749e430 (patch) | |
| tree | 1687a34bb8aff20fdfd64fda4b2e34a1e4d7fca4 | |
| parent | f0b32f868a43345c77b3852ed0b3fb0d5856bed4 (diff) | |
netlink_delinarize: shift constant for ranges too
... else rule like vlan pcp 1-3 won't work and will be displayed
as 0-0 (reverse direction already works since range is represented
as two lte/gte compare expressions).
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/netlink_linearize.c | 2 | ||||
| -rw-r--r-- | tests/py/bridge/vlan.t.payload | 4 | ||||
| -rw-r--r-- | tests/py/bridge/vlan.t.payload.netdev | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/netlink_linearize.c b/src/netlink_linearize.c index 49b46760..bb51de73 100644 --- a/src/netlink_linearize.c +++ b/src/netlink_linearize.c @@ -446,6 +446,7 @@ static void netlink_gen_range(struct netlink_linearize_ctx *ctx, BUG("invalid range operation %u\n", expr->op); } + payload_shift_value(expr->left, range->left); netlink_gen_data(range->left, &nld); nftnl_expr_set(nle, NFTNL_EXPR_CMP_DATA, nld.value, nld.len); nftnl_rule_add_expr(ctx->nlr, nle); @@ -466,6 +467,7 @@ static void netlink_gen_range(struct netlink_linearize_ctx *ctx, BUG("invalid range operation %u\n", expr->op); } + payload_shift_value(expr->left, range->right); netlink_gen_data(range->right, &nld); nftnl_expr_set(nle, NFTNL_EXPR_CMP_DATA, nld.value, nld.len); nftnl_rule_add_expr(ctx->nlr, nle); diff --git a/tests/py/bridge/vlan.t.payload b/tests/py/bridge/vlan.t.payload index 02242d22..78ee7ef7 100644 --- a/tests/py/bridge/vlan.t.payload +++ b/tests/py/bridge/vlan.t.payload @@ -196,6 +196,6 @@ 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 0x00000001 ] - [ cmp lte reg 1 0x00000003 ] + [ cmp gte reg 1 0x00000020 ] + [ cmp lte reg 1 0x00000060 ] diff --git a/tests/py/bridge/vlan.t.payload.netdev b/tests/py/bridge/vlan.t.payload.netdev index 62c7adf9..f60587fc 100644 --- a/tests/py/bridge/vlan.t.payload.netdev +++ b/tests/py/bridge/vlan.t.payload.netdev @@ -230,6 +230,6 @@ 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 0x00000001 ] - [ cmp lte reg 1 0x00000003 ] + [ cmp gte reg 1 0x00000020 ] + [ cmp lte reg 1 0x00000060 ] |