From patchwork Wed Jun 4 11:38:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 355844 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 895A114007C for ; Wed, 4 Jun 2014 21:38:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752681AbaFDLia (ORCPT ); Wed, 4 Jun 2014 07:38:30 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:51775 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752979AbaFDLi3 (ORCPT ); Wed, 4 Jun 2014 07:38:29 -0400 Received: by mail-wi0-f172.google.com with SMTP id hi2so8172735wib.11 for ; Wed, 04 Jun 2014 04:38:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7peOVTUrKDOzmfZbUqWsxBIZPLLDwFYZpEe8U2DblDQ=; b=otSKZWjiEdTM4pj2xcCu+7fbHy5LuW2W1sq2ULIOiK5Ake1vWCSyEFg27eSzqwa7T6 R3sYCyWWOqd1JPgIX7LU3MIgq2n10pa7XQW6jtrxcWoBTGArTC51HdyFTdLXDVu1GfX6 qU4BDdZNHJRVvkqTTYmsbMtvvw7LWArOhsrK0a3MmIxEYJRceMDhgD5KLwWHsgpB432T 4GAgs7vD+ntnNjrb3vsb7RnVdF+4kusiIips++bfD5mM/s2jDGqaLMMBUUNJYLviXg92 Vfcv5dxnxuZKxKne5gmnFNPVajSXJR63Cx2S2XKIpyUyU0g5iilZS5DEvuCEgXlMO3jV Q9RA== X-Received: by 10.180.91.104 with SMTP id cd8mr4589341wib.0.1401881907358; Wed, 04 Jun 2014 04:38:27 -0700 (PDT) Received: from localhost.localdomain (186.169.216.87.static.jazztel.es. [87.216.169.186]) by mx.google.com with ESMTPSA id be3sm3420890wjc.5.2014.06.04.04.38.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jun 2014 04:38:26 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH 5/5] expr: reject: Do not print unset values in json Date: Wed, 4 Jun 2014 13:38:11 +0200 Message-Id: <1401881891-4990-6-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: <1401881891-4990-1-git-send-email-anarey@gmail.com> References: <1401881891-4990-1-git-send-email-anarey@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org It changes the parse and the snprint functions to omit unset values. If It uses this rule: nft add rule ip test output input It gets this json file: [...] "expr":[{"type":"reject","type":0,"code":0}]} Now, That rule creates this json file without null values: [...] "expr":[{"type":"reject"}]} Signed-off-by: Ana Rey --- src/expr/reject.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/src/expr/reject.c b/src/expr/reject.c index 8fc99af..39de634 100644 --- a/src/expr/reject.c +++ b/src/expr/reject.c @@ -130,15 +130,11 @@ nft_rule_expr_reject_json_parse(struct nft_rule_expr *e, json_t *root, uint32_t type; uint8_t code; - if (nft_jansson_parse_val(root, "type", NFT_TYPE_U32, &type, err) < 0) - return -1; - - nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type); - - if (nft_jansson_parse_val(root, "code", NFT_TYPE_U8, &code, err) < 0) - return -1; + if (nft_jansson_parse_val(root, "type", NFT_TYPE_U32, &type, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_REJECT_TYPE, type); - nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code); + if (nft_jansson_parse_val(root, "code", NFT_TYPE_U8, &code, err) == 0) + nft_rule_expr_set_u8(e, NFT_EXPR_REJECT_CODE, code); return 0; #else @@ -203,11 +199,24 @@ static int nft_rule_expr_reject_snprintf_xml(char *buf, size_t len, static int nft_rule_expr_reject_snprintf_json(char *buf, size_t len, struct nft_rule_expr *e) { + int ret, size = len, offset = 0; struct nft_expr_reject *reject = nft_expr_data(e); - return snprintf(buf, len, "\"type\":%u," - "\"code\":%u,", - reject->type, reject->icmp_code); + if (e->flags & (1 << NFT_EXPR_REJECT_TYPE)) { + ret = snprintf(buf+offset, len, "\"type\":%u,", + reject->type); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (e->flags & (1 << NFT_EXPR_REJECT_CODE)) { + ret = snprintf(buf+offset, len, "\"code\":%u,", + reject->icmp_code); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + if (offset > 0) { + return offset-1; + } + return offset; } static int