From 78d773b519a4c3f41b3c515505bb8c3bad686fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Neira=20Ayuso?= Date: Mon, 15 Jul 2013 21:30:52 +0200 Subject: set: json: fix incomplete output In (bf39c53 set: add json output), the json support for sets was incomplete: * version, family, key_type, key_len, data_type, data_len were not included. * Now I use nft_data_reg_snprintf for printing the key and data Signed-off-by: Alvaro Neira Ayuso Signed-off-by: Pablo Neira Ayuso --- src/set_elem.c | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'src/set_elem.c') diff --git a/src/set_elem.c b/src/set_elem.c index 3966cd6..eeab726 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -385,34 +385,40 @@ int nft_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s) } EXPORT_SYMBOL(nft_set_elems_nlmsg_parse); -static int nft_set_elem_snprintf_json(char *buf, size_t size, struct nft_set_elem *e) +static int nft_set_elem_snprintf_json(char *buf, size_t size, + struct nft_set_elem *e, uint32_t flags) { - int ret, len = size, offset = 0, i, numregs; + int ret, len = size, offset = 0, type = -1; - ret = snprintf(buf, size, "\"flags\" : %u", e->set_elem_flags); + ret = snprintf(buf, size, "\"set_elem_flags\": %u", e->set_elem_flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - numregs = div_round_up(e->key.len, sizeof(uint32_t)); - if (numregs != 0) { - ret = snprintf(buf+offset, len, ", \"key\" : \"0x"); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - for (i = 0; i < numregs; i++) { - ret = snprintf(buf+offset, len, "%.8x", e->key.val[i]); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - } - ret = snprintf(buf+offset, len, "\""); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - } + ret = snprintf(buf+offset, size, ",\"set_elem_key\": {"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = nft_data_reg_snprintf(buf+offset, len, &e->key, + NFT_RULE_O_JSON, flags, DATA_VALUE); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, size, "}"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + if (e->flags & (1 << NFT_SET_ELEM_ATTR_DATA)) + type = DATA_VALUE; + else if (e->flags & (1 << NFT_SET_ELEM_ATTR_CHAIN)) + type = DATA_CHAIN; + else if (e->flags & (1 << NFT_SET_ELEM_ATTR_VERDICT)) + type = DATA_VERDICT; - numregs = div_round_up(e->data.len, sizeof(uint32_t)); - if (numregs != 0) { - ret = snprintf(buf+offset, size, " ,\"data\" : \"0x"); + if (type != -1) { + ret = snprintf(buf+offset, size, ",\"set_elem_data\": {"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - for (i = 0; i < numregs; i++) { - ret = snprintf(buf+offset, len, "%.8x", e->data.val[i]); + + ret = nft_data_reg_snprintf(buf+offset, len, &e->data, + NFT_RULE_O_JSON, flags, type); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - } - ret = snprintf(buf+offset, len, "\""); + + ret = snprintf(buf+offset, size, "}"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } @@ -514,7 +520,7 @@ int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_elem *e, case NFT_SET_O_XML: return nft_set_elem_snprintf_xml(buf, size, e, flags); case NFT_SET_O_JSON: - return nft_set_elem_snprintf_json(buf, size, e); + return nft_set_elem_snprintf_json(buf, size, e, flags); default: break; } -- cgit v1.2.3