mnl: Set NFTNL_SET_DATA_TYPE before dumping set elements

In combination with libnftnl's commit "set_elem: Fix printing of verdict
map elements", This adds the vmap target to netlink dumps. Adjust dumps
in tests/py accordingly.

Signed-off-by: Phil Sutter <phil@nwl.cc>

1 files changed, 3 insertions, 0 deletions

diff --git a/src/mnl.c b/src/mnl.c
index 9c965446..deea586f 100644
--- a/src/mnl.c
+++ b/src/mnl.c
@@ -1544,6 +1544,9 @@ int mnl_nft_setelem_add(struct netlink_ctx *ctx, const struct set *set,
 	nftnl_set_set_str(nls, NFTNL_SET_NAME, h->set.name);
 	if (h->set_id)
 		nftnl_set_set_u32(nls, NFTNL_SET_ID, h->set_id);
+	if (set_is_datamap(set->flags))
+		nftnl_set_set_u32(nls, NFTNL_SET_DATA_TYPE,
+				  dtype_map_to_kernel(set->data->dtype));
 
 	alloc_setelem_cache(expr, nls);
 	netlink_dump_set(nls, ctx);