From: Ana Rey <anarey@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: Ana Rey <anarey@gmail.com>
Subject: [libnftnl PATCH 2/4] expr: limit: Use nft_rule_expr_set_* in the xml parsing code
Date: Mon, 16 Jun 2014 11:10:15 +0200 [thread overview]
Message-ID: <1402909817-25325-3-git-send-email-anarey@gmail.com> (raw)
In-Reply-To: <1402909817-25325-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/limit.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/expr/limit.c b/src/expr/limit.c
index b7cd32d..6e0a732 100644
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
@@ -146,21 +146,19 @@ static int nft_rule_expr_limit_xml_parse(struct nft_rule_expr *e,
struct nft_parse_err *err)
{
#ifdef XML_PARSING
- struct nft_expr_limit *limit = nft_expr_data(e);
+ uint64_t rate, unit;
if (nft_mxml_num_parse(tree, "rate", MXML_DESCEND_FIRST, BASE_DEC,
- &limit->rate, NFT_TYPE_U64, NFT_XML_MAND,
- err) != 0)
+ &rate, NFT_TYPE_U64, NFT_XML_MAND,
+ err) < 0)
return -1;
-
- e->flags |= (1 << NFT_EXPR_LIMIT_RATE);
+ nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_RATE, rate);
if (nft_mxml_num_parse(tree, "unit", MXML_DESCEND_FIRST, BASE_DEC,
- &limit->unit, NFT_TYPE_U64, NFT_XML_MAND,
- err) != 0)
+ &unit, NFT_TYPE_U64, NFT_XML_MAND,
+ err) < 0)
return -1;
-
- e->flags |= (1 << NFT_EXPR_LIMIT_UNIT);
+ nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_UNIT, unit);
return 0;
#else
--
2.0.0
next prev parent reply other threads:[~2014-06-16 9:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-16 9:10 [libnftnl PATCH 0/4] limit: Do not print unset value Ana Rey
2014-06-16 9:10 ` [libnftnl PATCH 1/4] expr: limit: Add nft_rule_expr_limit_snprinf_* functions Ana Rey
2014-06-16 9:10 ` Ana Rey [this message]
2014-06-16 9:10 ` [libnftnl PATCH 3/4] expr: limit: Do not print unset values in json Ana Rey
2014-06-16 9:10 ` [libnftnl PATCH 4/4] expr: limit: Do not print unset values in xml Ana Rey
2014-06-16 10:34 ` [libnftnl PATCH 0/4] limit: Do not print unset value Pablo Neira Ayuso
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=1402909817-25325-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).