From patchwork Tue Jun 24 17:14:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 363557 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 9DA68140087 for ; Wed, 25 Jun 2014 03:14:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755377AbaFXROd (ORCPT ); Tue, 24 Jun 2014 13:14:33 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:57096 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753242AbaFXROc (ORCPT ); Tue, 24 Jun 2014 13:14:32 -0400 Received: by mail-wi0-f178.google.com with SMTP id n15so1017712wiw.11 for ; Tue, 24 Jun 2014 10:14:31 -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=hH/D74ey2S0XKxnJe2W2lLY2iS5Jf5nQjPluijP229k=; b=0IInDHC3okHviaefM9YBND9tz/de2w3AaBwQdI8bGvG5TKXP9zx5EZoBKoIZCs5bM1 fwjIwjA9jL3oNumXHSK26WHjRgJsfRtYJqAL+TNL2LGfGxQjUbU+QHrsMJkuVIse3Lfw yNqxgsC64vyEJ1rrXTNdt8e2vMBzP6JrbYczo4H/AjfpAveXA0ikKH3M22XVvyJ6l0xb SWJivZ/4gHC1SRcFSjNP05W7w994nzyezS73y7C5djoWcRnRhVSOJqLxWOZuSt5CtRS8 tzVfeINO3XYwTj4OvqXzw2ijHVqUZHBqh0PZdY6fSYHsxD45vBZz3+qJW1j+6cicsXxh jEDQ== X-Received: by 10.194.2.244 with SMTP id 20mr3103702wjx.26.1403630071001; Tue, 24 Jun 2014 10:14:31 -0700 (PDT) Received: from localhost.localdomain (186.169.216.87.static.jazztel.es. [87.216.169.186]) by mx.google.com with ESMTPSA id cy4sm3512602wib.5.2014.06.24.10.14.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jun 2014 10:14:30 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH 3/3] expr: lookup: Do not print unset values in json file Date: Tue, 24 Jun 2014 19:14:17 +0200 Message-Id: <1403630057-12996-4-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403630057-12996-1-git-send-email-anarey@gmail.com> References: <1403630057-12996-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 functions to omit unset values. Signed-off-by: Ana Rey --- src/expr/lookup.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/expr/lookup.c b/src/expr/lookup.c index d0d81cb..3f77228 100644 --- a/src/expr/lookup.c +++ b/src/expr/lookup.c @@ -164,23 +164,17 @@ nft_rule_expr_lookup_json_parse(struct nft_rule_expr *e, json_t *root, { #ifdef JSON_PARSING const char *set_name; - int32_t reg; + uint32_t sreg, dreg; set_name = nft_jansson_parse_str(root, "set", err); - if (set_name == NULL) - return -1; - - nft_rule_expr_set_str(e, NFT_EXPR_LOOKUP_SET, set_name); - - if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, ®, err) < 0) - return -1; - - nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, reg); + if (set_name != NULL) + nft_rule_expr_set_str(e, NFT_EXPR_LOOKUP_SET, set_name); - if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, ®, err) < 0) - return -1; + if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &sreg, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, sreg); - nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, reg); + if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &dreg, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, dreg); return 0; #else @@ -224,19 +218,25 @@ nft_rule_expr_lookup_snprintf_json(char *buf, size_t size, int len = size, offset = 0, ret; struct nft_expr_lookup *l = nft_expr_data(e); - ret = snprintf(buf, len, "\"set\":\"%s\",\"sreg\":%u", - l->set_name, l->sreg); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - + if (e->flags & (1 << NFT_EXPR_LOOKUP_SET)) { + ret = snprintf(buf, len, "\"set\":\"%s\",", l->set_name); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (e->flags & (1 << NFT_EXPR_LOOKUP_SREG)) { + ret = snprintf(buf + offset, len, "\"sreg\":%u,", l->sreg); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } if (e->flags & (1 << NFT_EXPR_LOOKUP_DREG)) { - ret = snprintf(buf+offset, len, ",\"dreg\":%u", l->dreg); + ret = snprintf(buf + offset, len, "\"dreg\":%u,", l->dreg); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } + /* Remove the last comma characther */ + if (offset > 0) + offset--; return offset; } - static int nft_rule_expr_lookup_snprintf_xml(char *buf, size_t size, struct nft_rule_expr *e)