diff options
| author | Florian Westphal <fw@strlen.de> | 2020-07-22 13:51:25 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2020-07-23 15:08:40 +0200 |
| commit | 8d15c9712576b94aef373853c303cd8c870a22dd (patch) | |
| tree | 42cbd9cb6d3accefe3bcfa0944a450b7c65b3772 | |
| parent | 49d4fe2170b866b3995e764f8b9c4d65ec2b7898 (diff) | |
netlink: fix concat range expansion in map case
Maps with range + concatenation do not work:
Input to nft -f:
map map_test_concat_interval {
type ipv4_addr . ipv4_addr : mark
flags interval
elements = { 192.168.0.0/24 . 192.168.0.0/24 : 1,
192.168.0.0/24 . 10.0.0.1 : 2,
192.168.1.0/24 . 10.0.0.1 : 3,
192.168.0.0/24 . 192.168.1.10 : 4,
}
}
nft list:
map map_test_concat_interval {
type ipv4_addr . ipv4_addr : mark
flags interval
elements = { 192.168.0.0 . 192.168.0.0-10.0.0.1 : 0x00000002,
192.168.1.0-192.168.0.0 . 10.0.0.1-192.168.1.10 : 0x00000004 }
}
This is not a display bug, nft sends broken information
to kernel. Use the correct key expression to fix this.
Fixes: 8ac2f3b2fca3 ("src: Add support for concatenated set ranges")
Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
| -rw-r--r-- | src/netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/netlink.c b/src/netlink.c index f752c3c9..b57e1c55 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -123,7 +123,7 @@ static struct nftnl_set_elem *alloc_nftnl_setelem(const struct expr *set, netlink_gen_data(key, &nld); nftnl_set_elem_set(nlse, NFTNL_SET_ELEM_KEY, &nld.value, nld.len); - if (set->set_flags & NFT_SET_INTERVAL && expr->key->field_count > 1) { + if (set->set_flags & NFT_SET_INTERVAL && key->field_count > 1) { key->flags |= EXPR_F_INTERVAL_END; netlink_gen_data(key, &nld); key->flags &= ~EXPR_F_INTERVAL_END; |