From patchwork Sun Jun 22 18:32:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 362572 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 2F23A140085 for ; Mon, 23 Jun 2014 04:32:38 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752363AbaFVSch (ORCPT ); Sun, 22 Jun 2014 14:32:37 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:60477 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752335AbaFVScg (ORCPT ); Sun, 22 Jun 2014 14:32:36 -0400 Received: by mail-wi0-f172.google.com with SMTP id hi2so3000376wib.11 for ; Sun, 22 Jun 2014 11:32:35 -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=6FBTc5qzwbb4qJEO5t1B4f61LdZhsyyQgkv9aqAXMAk=; b=dHr3fFYel5lgxio2rSaD2hKikYE1VHfjVioQc81K0BnH0tPKf2l+3ChtRSkfHMKZUE R/Gzr3JYKzjZFCqg+niCZ5viE7TETg4dG/ugDdStfaelCoDe/JijGalj53vPunLNUp9k v/1yT7bim131iqwOMWaFU/yhj4+pRBXqtx/C84/X81yKxz7he9hWw0nu1QDBdich8Eil GhB2ZKF//ISQZ/blXPgPBoHUzCxu1c8dXciuaMSHu+Zsr99ce/Q9HhXHqeiplSJ/IOue oI1rVKWr2Ie+36FZaYYHR3rMM9bSJNLWtitkMWB/3hrGwBfO1+veqE3wKj1Eh6kKYzNc NsSw== X-Received: by 10.194.219.70 with SMTP id pm6mr21029241wjc.53.1403461955456; Sun, 22 Jun 2014 11:32:35 -0700 (PDT) Received: from localhost.localdomain ([188.84.98.232]) by mx.google.com with ESMTPSA id w5sm25767474wif.3.2014.06.22.11.32.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 22 Jun 2014 11:32:34 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey Subject: [libnftnl PATCH 3/4] expr: payload: Do not print unset values in xml file Date: Sun, 22 Jun 2014 20:32:20 +0200 Message-Id: <1403461941-21605-4-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1403461941-21605-1-git-send-email-anarey@gmail.com> References: <1403461941-21605-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 snprintf functions to omit unset values. Signed-off-by: Ana Rey --- src/expr/payload.c | 54 +++++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/src/expr/payload.c b/src/expr/payload.c index 6c08e48..3cf2362 100644 --- a/src/expr/payload.c +++ b/src/expr/payload.c @@ -247,32 +247,25 @@ nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, uint32_t dreg, offset, len; if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND_FIRST, - NFT_XML_MAND, err) != 0) - return -1; - - nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_DREG, dreg); + NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_DREG, dreg); base_str = nft_mxml_str_parse(tree, "base", MXML_DESCEND_FIRST, NFT_XML_MAND, err); - if (base_str == NULL) - return -1; - - base = nft_str2base(base_str); - if (base < 0) - return -1; - - nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_BASE, base); + if (base_str != NULL) { + base = nft_str2base(base_str); + if (base >= 0) + nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_BASE, base); + } if (nft_mxml_num_parse(tree, "offset", MXML_DESCEND_FIRST, BASE_DEC, - &offset, NFT_TYPE_U32, NFT_XML_MAND, err) != 0) - return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_OFFSET, offset); + &offset, NFT_TYPE_U32, NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_OFFSET, offset); if (nft_mxml_num_parse(tree, "len", MXML_DESCEND_FIRST, BASE_DEC, - &len, NFT_TYPE_U32, NFT_XML_MAND, err) != 0) - return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_LEN, len); + &len, NFT_TYPE_U32, NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_LEN, len); return 0; #else @@ -288,13 +281,24 @@ nft_rule_expr_payload_snprintf_xml(char *buf, size_t len, uint32_t flags, struct nft_expr_payload *payload = nft_expr_data(e); int size = len, offset = 0, ret; - ret = snprintf(buf, len, "%u" - "%u" - "%u" - "%s", - payload->dreg, payload->offset, payload->len, - base2str(payload->base)); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (e->flags & (1 << NFT_EXPR_PAYLOAD_DREG)) { + ret = snprintf(buf, len, "%u", payload->dreg); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (e->flags & (1 << NFT_EXPR_PAYLOAD_OFFSET)) { + ret = snprintf(buf + offset, len, "%u", + payload->offset); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (e->flags & (1 << NFT_EXPR_PAYLOAD_LEN)) { + ret = snprintf(buf + offset, len, "%u", payload->len); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (e->flags & (1 << NFT_EXPR_PAYLOAD_BASE)) { + ret = snprintf(buf + offset, len, "%s", + base2str(payload->base)); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } return offset; }