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.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'src/set.c') diff --git a/src/set.c b/src/set.c index 3874a5b..2616cae 100644 --- a/src/set.c +++ b/src/set.c @@ -317,16 +317,27 @@ int nft_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nft_set *s) EXPORT_SYMBOL(nft_set_nlmsg_parse); static int nft_set_snprintf_json(char *buf, size_t size, struct nft_set *s, - uint32_t type, uint32_t flags) + uint32_t type, uint32_t flags) { - int ret; - int len = size, offset = 0; + int len = size, offset = 0, ret; struct nft_set_elem *elem; - ret = snprintf(buf, size, "{ \"set\" : { \"name\" : \"%s\", \"table\" : \"%s\", \"flags\" : %u", - s->name, s->table, s->set_flags); + ret = snprintf(buf, size, "{ \"set\": { \"name\": \"%s\"," + "\"table\": \"%s\",\"version\": %d," + "\"flags\": %u,\"family\": \"%s\"," + "\"key_type\": %u,\"key_len\": %u", + s->name, s->table, NFT_SET_JSON_VERSION, s->set_flags, + nft_family2str(s->family), s->key_type, s->key_len); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if(s->flags & (1 << NFT_SET_ATTR_DATA_TYPE) && + s->flags & (1 << NFT_SET_ATTR_DATA_LEN)){ + ret = snprintf(buf+offset, size, + ",\"data_type\": %u,\"data_len\": %u", + s->data_type, s->data_len); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + /* Empty set? Skip printinf of elements */ if (list_empty(&s->element_list)){ ret = snprintf(buf+offset, size, "}}"); @@ -334,7 +345,7 @@ static int nft_set_snprintf_json(char *buf, size_t size, struct nft_set *s, return offset; } - ret = snprintf(buf+offset, size, ", \"set_elem\" : ["); + ret = snprintf(buf+offset, size, ",\"set_elem\": ["); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); list_for_each_entry(elem, &s->element_list, head) { -- cgit v1.2.3