From 228e8b1746270ee5c4a41b671a01369c75622587 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Sat, 26 Dec 2020 19:44:48 +0100 Subject: set_elem: Fix printing of verdict map elements Elements' data was printed as type DATA_VALUE no matter the actual type. For verdicts, this meant no printing at all (because reg->len is either zero or garbage). To fix this, nftnl_set_elem_snprintf_default() needs type info held in struct nftnl_set. Pass it via parameter to that function, make it non-static and call it from nftnl_set_snprintf_default() instead of the generic nftnl_set_elem_snprintf(). This way no changes have to be done to exported functions, also the output type is already defined when nftnl_set_snprintf_default() runs so checking type value again is pointless. Signed-off-by: Phil Sutter --- src/set.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/set.c') diff --git a/src/set.c b/src/set.c index 8c5025d..a21df1f 100644 --- a/src/set.c +++ b/src/set.c @@ -829,8 +829,8 @@ static int nftnl_set_snprintf_default(char *buf, size_t size, ret = snprintf(buf + offset, remain, "\t"); SNPRINTF_BUFFER_SIZE(ret, remain, offset); - ret = nftnl_set_elem_snprintf(buf + offset, remain, elem, type, - flags); + ret = nftnl_set_elem_snprintf_default(buf + offset, remain, + elem, s->data_type); SNPRINTF_BUFFER_SIZE(ret, remain, offset); } -- cgit v1.2.3