From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ana Rey Subject: [PATCH v2 2/2] src: expr: log: Do not print unset values in xml. Date: Mon, 2 Jun 2014 12:11:33 +0200 Message-ID: <1401703893-17050-3-git-send-email-anarey@gmail.com> References: <1401703893-17050-1-git-send-email-anarey@gmail.com> Cc: Ana Rey To: netfilter-devel@vger.kernel.org Return-path: Received: from mail-wg0-f50.google.com ([74.125.82.50]:62107 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753960AbaFBKLp (ORCPT ); Mon, 2 Jun 2014 06:11:45 -0400 Received: by mail-wg0-f50.google.com with SMTP id x12so4778556wgg.33 for ; Mon, 02 Jun 2014 03:11:44 -0700 (PDT) In-Reply-To: <1401703893-17050-1-git-send-email-anarey@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org List-ID: 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 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 bf18b42..34c939f 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -212,27 +212,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 @@ -254,14 +252,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, -- 2.0.0.rc2