From 44f00c23a9935d7d2912a2d3588b27bac8d6dc9a Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Mon, 16 Jun 2014 11:10:17 +0200 Subject: expr: limit: Do not print unset values in xml It changes the parse and the snprint functions to omit unset values. Now, This part of a xml file is gotten without unset elements. 400 60 Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/expr/limit.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/expr/limit.c b/src/expr/limit.c index 78206fa..c706a72 100644 --- a/src/expr/limit.c +++ b/src/expr/limit.c @@ -145,16 +145,12 @@ static int nft_rule_expr_limit_xml_parse(struct nft_rule_expr *e, uint64_t rate, unit; if (nft_mxml_num_parse(tree, "rate", MXML_DESCEND_FIRST, BASE_DEC, - &rate, NFT_TYPE_U64, NFT_XML_MAND, - err) < 0) - return -1; - nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_RATE, rate); + &rate, NFT_TYPE_U64, NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_RATE, rate); if (nft_mxml_num_parse(tree, "unit", MXML_DESCEND_FIRST, BASE_DEC, - &unit, NFT_TYPE_U64, NFT_XML_MAND, - err) < 0) - return -1; - nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_UNIT, unit); + &unit, NFT_TYPE_U64, NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_UNIT, unit); return 0; #else @@ -179,10 +175,20 @@ static int nft_rule_expr_limit_snprintf_xml(char *buf, size_t len, struct nft_rule_expr *e) { struct nft_expr_limit *limit = nft_expr_data(e); + int ret, size = len, offset = 0; - return snprintf(buf, len, "%"PRIu64"" - "%"PRIu64"", - limit->rate, limit->unit); + if (e->flags & (1 << NFT_EXPR_LIMIT_RATE)) { + ret = snprintf(buf + offset, len, "%"PRIu64"", + limit->rate); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (e->flags & (1 << NFT_EXPR_LIMIT_UNIT)) { + ret = snprintf(buf + offset, len, "%"PRIu64"", + limit->unit); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + return offset; } static int nft_rule_expr_limit_snprintf_json(char *buf, size_t len, -- cgit v1.2.3