From add2bc2068992daf520082c2765261227afd8f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Neira=20Ayuso?= Date: Fri, 9 Aug 2013 13:13:14 +0200 Subject: src: json: delete unneeded JSON prefixes This patch adapts JSON nodes to mimic current XML node tags. Signed-off-by: Alvaro Neira Ayuso Ayuso Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 3 +-- src/set_elem.c | 6 +++--- src/table.c | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/rule.c b/src/rule.c index 4f9a039..f2b714e 100644 --- a/src/rule.c +++ b/src/rule.c @@ -629,8 +629,7 @@ static int nft_rule_snprintf_json(char *buf, size_t size, struct nft_rule *r, (unsigned long long)r->handle); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = snprintf(buf+offset, len, "\"rule_flags\" : %u, ", - r->rule_flags); + ret = snprintf(buf+offset, len, "\"flags\" : %u, ", r->rule_flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); if (r->flags & (1 << NFT_RULE_ATTR_COMPAT_PROTO) || diff --git a/src/set_elem.c b/src/set_elem.c index 73c100f..c3ac1da 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -469,10 +469,10 @@ static int nft_set_elem_snprintf_json(char *buf, size_t size, { int ret, len = size, offset = 0, type = -1; - ret = snprintf(buf, size, "\"set_elem_flags\": %u", e->set_elem_flags); + ret = snprintf(buf, size, "\"flags\": %u", e->set_elem_flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = snprintf(buf+offset, size, ",\"set_elem_key\": {"); + ret = snprintf(buf+offset, size, ",\"key\": {"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); ret = nft_data_reg_snprintf(buf+offset, len, &e->key, @@ -490,7 +490,7 @@ static int nft_set_elem_snprintf_json(char *buf, size_t size, type = DATA_VERDICT; if (type != -1) { - ret = snprintf(buf+offset, size, ",\"set_elem_data\": {"); + ret = snprintf(buf+offset, size, ",\"data\": {"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); ret = nft_data_reg_snprintf(buf+offset, len, &e->data, diff --git a/src/table.c b/src/table.c index 85993eb..18d9077 100644 --- a/src/table.c +++ b/src/table.c @@ -295,7 +295,7 @@ static int nft_table_json_parse(struct nft_table *t, char *json) nft_table_attr_set_u32(t, NFT_TABLE_ATTR_FAMILY, family); - if (nft_jansson_value_parse_val(root, "table_flags", + if (nft_jansson_value_parse_val(root, "flags", NFT_TYPE_U32, &table_flag) == -1) goto err; @@ -340,7 +340,7 @@ static int nft_table_snprintf_json(char *buf, size_t size, struct nft_table *t) "{\"table\" : {" "\"name\" : \"%s\"," "\"family\" : \"%s\"," - "\"table_flags\" : %d" + "\"flags\" : %d" "}" "}" , t->name, nft_family2str(t->family), t->table_flags); -- cgit v1.2.3