From: Ana Rey <anarey@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: Ana Rey <anarey@gmail.com>
Subject: [libnftnl PATCH 2/4] expr: counter: Use nft_rule_expr_set_* in the xml parsing code
Date: Tue, 24 Jun 2014 09:15:36 +0200 [thread overview]
Message-ID: <1403594138-6148-3-git-send-email-anarey@gmail.com> (raw)
In-Reply-To: <1403594138-6148-1-git-send-email-anarey@gmail.com>
Code refactoring to use nft_rule_expr_set_* in parse functions.
Signed-off-by: Ana Rey <anarey@gmail.com>
---
src/expr/counter.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/expr/counter.c b/src/expr/counter.c
index 65acee3..9d85a96 100644
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
@@ -147,21 +147,19 @@ nft_rule_expr_counter_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
struct nft_parse_err *err)
{
#ifdef XML_PARSING
- struct nft_expr_counter *ctr = nft_expr_data(e);
+ uint64_t pkts, bytes;
if (nft_mxml_num_parse(tree, "pkts", MXML_DESCEND_FIRST, BASE_DEC,
- &ctr->pkts, NFT_TYPE_U64, NFT_XML_MAND,
+ &pkts, NFT_TYPE_U64, NFT_XML_MAND,
err) != 0)
return -1;
-
- e->flags |= (1 << NFT_EXPR_CTR_PACKETS);
+ nft_rule_expr_set_u64(e, NFT_EXPR_CTR_PACKETS, pkts);
if (nft_mxml_num_parse(tree, "bytes", MXML_DESCEND_FIRST, BASE_DEC,
- &ctr->bytes, NFT_TYPE_U64, NFT_XML_MAND,
+ &bytes, NFT_TYPE_U64, NFT_XML_MAND,
err) != 0)
return -1;
-
- e->flags |= (1 << NFT_EXPR_CTR_BYTES);
+ nft_rule_expr_set_u64(e, NFT_EXPR_CTR_BYTES, bytes);
return 0;
#else
--
2.0.0
next prev parent reply other threads:[~2014-06-24 7:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-24 7:15 [libnftnl PATCH 0/4] expr: counter: Do not print unset values in xml and json Ana Rey
2014-06-24 7:15 ` [libnftnl PATCH 1/4] expr: counter: Add nft_rule_expr_counter_snprinf_* functions Ana Rey
2014-06-24 7:15 ` Ana Rey [this message]
2014-06-24 7:15 ` [libnftnl PATCH 3/4] expr: counter: Do not print unset values in xml Ana Rey
2014-06-24 7:15 ` [libnftnl PATCH 4/4] expr: counter: Do not print unset values in json Ana Rey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403594138-6148-3-git-send-email-anarey@gmail.com \
--to=anarey@gmail.com \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).