From patchwork Sat Jun 21 15:53:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 362455 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 1B6B0140086 for ; Sun, 22 Jun 2014 01:54:16 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753291AbaFUPyM (ORCPT ); Sat, 21 Jun 2014 11:54:12 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:52612 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752353AbaFUPyJ (ORCPT ); Sat, 21 Jun 2014 11:54:09 -0400 Received: by mail-wi0-f169.google.com with SMTP id hi2so2293081wib.0 for ; Sat, 21 Jun 2014 08:54:07 -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=lV0CA9jFCvzq8fznJo1x2kmN25Vd3UN3mf4pBDQlS1M=; b=VGRyPedmgBiF4TvldGkHqar8CwcJwt4OrubyazO81sdWdPp85bQO7M+W0KclXXT2Kc WVmZsfboS4Fo6ee0y61r9xnyyCRk+IB2cjJvYl6/BiAnI3IKUR58cBt+DE8eaYCepDtX sdQUD6U6fRNIaJ3/Q8xJm33BNtRORq6017kjH807kjc8he/lIyHK+b7KnEI8li2bv4Fp e95lGxKrtV10vvIvEdZyMgwtfvBlFDWPhllcn644gvsMKnwezaKnnFUGzi7Yolh3c6Wi /iTMr1EQct6raoMBpYPzXx3PLRYML8EwEk+EWzrhPdIdg8ALHzhf+E6iK2M9/aN4c1d7 /E+w== X-Received: by 10.194.20.230 with SMTP id q6mr1199349wje.43.1403366047858; Sat, 21 Jun 2014 08:54:07 -0700 (PDT) Received: from localhost.localdomain ([188.84.98.232]) by mx.google.com with ESMTPSA id ge6sm5964712wic.0.2014.06.21.08.54.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 21 Jun 2014 08:54:07 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH 3/3] expr: immediate: Do not print unset values in xml file Date: Sat, 21 Jun 2014 17:53:43 +0200 Message-Id: <1403366023-6385-4-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403366023-6385-1-git-send-email-anarey@gmail.com> References: <1403366023-6385-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/immediate.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/src/expr/immediate.c b/src/expr/immediate.c index b52bd23..af3324b 100644 --- a/src/expr/immediate.c +++ b/src/expr/immediate.c @@ -223,24 +223,25 @@ nft_rule_expr_immediate_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, uint32_t reg; if (nft_mxml_reg_parse(tree, "dreg", ®, MXML_DESCEND_FIRST, - NFT_XML_MAND, err) != 0) - return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_IMM_DREG, reg); + NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_IMM_DREG, reg); datareg_type = nft_mxml_data_reg_parse(tree, "immediatedata", &imm->data, NFT_XML_MAND, err); - switch (datareg_type) { - case DATA_VALUE: - e->flags |= (1 << NFT_EXPR_IMM_DATA); - break; - case DATA_VERDICT: - e->flags |= (1 << NFT_EXPR_IMM_VERDICT); - break; - case DATA_CHAIN: - e->flags |= (1 << NFT_EXPR_IMM_CHAIN); - break; - default: - return -1; + if (datareg_type >= 0) { + switch (datareg_type) { + case DATA_VALUE: + e->flags |= (1 << NFT_EXPR_IMM_DATA); + break; + case DATA_VERDICT: + e->flags |= (1 << NFT_EXPR_IMM_VERDICT); + break; + case DATA_CHAIN: + e->flags |= (1 << NFT_EXPR_IMM_CHAIN); + break; + default: + return -1; + } } return 0; @@ -288,22 +289,23 @@ nft_rule_expr_immediate_snprintf_xml(char *buf, size_t len, int size = len, offset = 0, ret; struct nft_expr_immediate *imm = nft_expr_data(e); - ret = snprintf(buf, len, "%u", imm->dreg); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - + if (e->flags & (1 << NFT_EXPR_IMM_DREG)) { + ret = snprintf(buf, len, "%u", imm->dreg); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } if (e->flags & (1 << NFT_EXPR_IMM_DATA)) { - ret = nft_data_reg_snprintf(buf+offset, len, &imm->data, + ret = nft_data_reg_snprintf(buf + offset, len, &imm->data, NFT_OUTPUT_XML, flags, DATA_VALUE); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } else if (e->flags & (1 << NFT_EXPR_IMM_VERDICT)) { - ret = nft_data_reg_snprintf(buf+offset, len, &imm->data, + ret = nft_data_reg_snprintf(buf + offset, len, &imm->data, NFT_OUTPUT_XML, flags, DATA_VERDICT); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } else if (e->flags & (1 << NFT_EXPR_IMM_CHAIN)) { - ret = nft_data_reg_snprintf(buf+offset, len, &imm->data, + ret = nft_data_reg_snprintf(buf + offset, len, &imm->data, NFT_OUTPUT_XML, flags, DATA_CHAIN); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); }