From patchwork Mon Jun 2 12:06:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 354852 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 198C61400A3 for ; Mon, 2 Jun 2014 22:06:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754134AbaFBMGr (ORCPT ); Mon, 2 Jun 2014 08:06:47 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:58796 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752784AbaFBMGq (ORCPT ); Mon, 2 Jun 2014 08:06:46 -0400 Received: by mail-wg0-f48.google.com with SMTP id k14so5009414wgh.19 for ; Mon, 02 Jun 2014 05:06:45 -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=irzdKUqphHLfxcBkBW612eZj3/32qjNqFjyKVDljRds=; b=wLRj6XcUvYcn5IefnVizwPRVT/jh13SkrXW9eqUzcKiiuPaDkcQvHl9/QBNp1VjImC qIJ/mKzQ14htcyqVk3L0ACgVmb5cfsk57OBUGnOafyY6P61cZmUV5GB5kDBfqjB5IYOl ji32wAXserVFv0HGiXwnSKA2PsdLKi6OKJxwigskJ3ut6HghmQeWEDPxBHWdadF/CLnW Y3tH4gSr4MV33p1kwfUGVq5D4iRyekYfTLXMMpG5liT6VUoQYSieUJ09Wa4owHe3Gf3s yuc3MgphBMfz9Cg/te2p5nzXbGz4z81Doa5HgwBidQvMuaWyd1hXFybp1OzWSYJG/jCk 60Hg== X-Received: by 10.180.210.237 with SMTP id mx13mr21654661wic.49.1401710805288; Mon, 02 Jun 2014 05:06:45 -0700 (PDT) Received: from localhost.localdomain ([188.84.98.232]) by mx.google.com with ESMTPSA id lq14sm32057495wic.7.2014.06.02.05.06.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Jun 2014 05:06:44 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH v3 2/2] src: expr: log: Do not print unset values in xml. Date: Mon, 2 Jun 2014 14:06:10 +0200 Message-Id: <1401710770-23662-3-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0.rc2 In-Reply-To: <1401710770-23662-1-git-send-email-anarey@gmail.com> References: <1401710770-23662-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 we used this rule: ntt add rule ip test output log We got this xml file: ip test
output 88 (null) 0 0 0 And It was imposible import this file. Now, That rule creates this xml file without null values: ip test
output 88 and It's possible import this xml file. Signed-off-by: Ana Rey --- [Changes in v3] Fix wrong indentation. [Changes in v2] This patch has some changes that derive from the previous "src: expr: log: Code refactoring to use nft_rule_expr_set_* functions" patch. src/expr/log.c | 57 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/src/expr/log.c b/src/expr/log.c index 0b7c646..12e9990 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -214,27 +214,25 @@ static int nft_rule_expr_log_xml_parse(struct nft_rule_expr *e, prefix = nft_mxml_str_parse(tree, "prefix", MXML_DESCEND_FIRST, NFT_XML_MAND, err); - if (prefix == NULL) - return -1; - nft_rule_expr_set_str(e, NFT_EXPR_LOG_PREFIX, prefix); + if (prefix != NULL) + nft_rule_expr_set_str(e, NFT_EXPR_LOG_PREFIX, prefix); if (nft_mxml_num_parse(tree, "group", MXML_DESCEND_FIRST, BASE_DEC, &log->group, NFT_TYPE_U16, NFT_XML_MAND, - err) != 0) - return -1; - nft_rule_expr_set_u16(e, NFT_EXPR_LOG_GROUP, log->group); + err) == 0) + nft_rule_expr_set_u16(e, NFT_EXPR_LOG_GROUP, log->group); if (nft_mxml_num_parse(tree, "snaplen", MXML_DESCEND_FIRST, BASE_DEC, &log->snaplen, NFT_TYPE_U32, NFT_XML_MAND, - err) != 0) - return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_LOG_SNAPLEN, log->snaplen); - - if (nft_mxml_num_parse(tree, "qthreshold", MXML_DESCEND_FIRST, - BASE_DEC, &log->qthreshold, - NFT_TYPE_U16, NFT_XML_MAND, err) != 0) - return -1; - nft_rule_expr_set_u16(e, NFT_EXPR_LOG_QTHRESHOLD, log->qthreshold); + err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_LOG_SNAPLEN, log->snaplen); + + if (nft_mxml_num_parse(tree, "qthreshold", MXML_DESCEND_FIRST, BASE_DEC, + &log->qthreshold, NFT_TYPE_U16, NFT_XML_MAND, + err) == 0) { + nft_rule_expr_set_u16(e, NFT_EXPR_LOG_QTHRESHOLD, + log->qthreshold); + } return 0; #else @@ -256,14 +254,31 @@ static int nft_rule_expr_log_snprintf_default(char *buf, size_t len, static int nft_rule_expr_log_snprintf_xml(char *buf, size_t size, struct nft_rule_expr *e) { + int ret, len = size, offset = 0; struct nft_expr_log *log = nft_expr_data(e); - return snprintf(buf, size, "%s" - "%u" - "%u" - "%u", - log->prefix, log->group, - log->snaplen, log->qthreshold); + if (e->flags & (1 << NFT_EXPR_LOG_PREFIX)) { + ret = snprintf(buf+offset, len, "%s", + log->prefix); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (e->flags & (1 << NFT_EXPR_LOG_GROUP)) { + ret = snprintf(buf+offset, len, "%u", + log->group); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (e->flags & (1 << NFT_EXPR_LOG_SNAPLEN)) { + ret = snprintf(buf+offset, len, "%u", + log->snaplen); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (e->flags & (1 << NFT_EXPR_LOG_QTHRESHOLD)) { + ret = snprintf(buf+offset, len, "%u", + log->qthreshold); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + return offset; } static int nft_rule_expr_log_snprintf_json(char *buf, size_t len,