From patchwork Fri Aug 9 11:13:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alvaro Neira X-Patchwork-Id: 265997 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BBC592C00A6 for ; Fri, 9 Aug 2013 21:13:26 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967744Ab3HILNZ (ORCPT ); Fri, 9 Aug 2013 07:13:25 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:38398 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967573Ab3HILNZ (ORCPT ); Fri, 9 Aug 2013 07:13:25 -0400 Received: by mail-wg0-f52.google.com with SMTP id b13so3439062wgh.31 for ; Fri, 09 Aug 2013 04:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=VSwXeUPIzTo/pKLUoQYmWMRSNb6HcsTvkPJWsDoXwZg=; b=DEhEQLwIJLmZgQwvvKfTQbR3z975431uzdtSimY9jg/+eSUciNaxOULzENcEJ0Wg6+ d2BeKoxQEWxBm34kpxKrDJ0+7CMxSBQxW2V6IxjFRznVDV2p6pl2ziLb2VEH9jgyzbqL 3MeSH8qwZ785aH4u40KtJT+tr26rWD4ylOH5lqdFGnUZnwLzNF5BVJF2dV0P7Nv5BBPH TfFluittB8nPJEHhJQV75gWkYovCoVg6vH6fB3nN9oQVkF9EsvYsJBuWOe4KUCbxXpOy neQSFH4nvkjASC2Y6f/CdPqTZYwJydGPGLalpWgrjwuJ+QodbZjLGGXMxLs+bwVXONAf L9gg== X-Received: by 10.180.104.73 with SMTP id gc9mr19245wib.13.1376046804188; Fri, 09 Aug 2013 04:13:24 -0700 (PDT) Received: from [127.0.1.1] ([90.174.0.186]) by mx.google.com with ESMTPSA id ee5sm2192553wib.3.2013.08.09.04.13.17 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 Aug 2013 04:13:23 -0700 (PDT) Subject: [libnftables PATCH 07/13] src: json: delete unneeded JSON prefixes To: netfilter-devel@vger.kernel.org From: Alvaro Neira Cc: eric@regit.org Date: Fri, 09 Aug 2013 13:13:14 +0200 Message-ID: <20130809111314.29819.36371.stgit@Ph0enix> In-Reply-To: <20130809111148.29819.95689.stgit@Ph0enix> References: <20130809111148.29819.95689.stgit@Ph0enix> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Álvaro Neira Ayuso This patch changes some JSON nodes with prefixes like XML nodes Signed-off-by: Alvaro Neira Ayuso --- src/rule.c | 2 +- src/set_elem.c | 6 +++--- src/table.c | 4 ++-- tests/jsonfiles/01-table.json | 2 +- tests/jsonfiles/02-table.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/rule.c b/src/rule.c index 41534bd..8a86f54 100644 --- a/src/rule.c +++ b/src/rule.c @@ -629,7 +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, ", + ret = snprintf(buf+offset, len, "\"flags\" : %u, ", r->rule_flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); 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); diff --git a/tests/jsonfiles/01-table.json b/tests/jsonfiles/01-table.json index a5ba38b..b4fc91b 100644 --- a/tests/jsonfiles/01-table.json +++ b/tests/jsonfiles/01-table.json @@ -1 +1 @@ -{"table" : {"name" : "filter","family" : "ip","table_flags" : 0}} +{"table" : {"name" : "filter","family" : "ip","flags" : 0}} diff --git a/tests/jsonfiles/02-table.json b/tests/jsonfiles/02-table.json index f1171a1..01eff74 100644 --- a/tests/jsonfiles/02-table.json +++ b/tests/jsonfiles/02-table.json @@ -1 +1 @@ -{"table" : {"name" : "filter2","family" : "ip6","table_flags" : 0}} +{"table" : {"name" : "filter2","family" : "ip6","flags" : 0}}