From e13819c5f5b6138c4c7e01156d0fd9f58b11702d Mon Sep 17 00:00:00 2001 From: Arturo Borrero Date: Thu, 25 Jul 2013 18:46:35 +0200 Subject: src: xml: consolidate common XML code via nft_mxml_num_parse This patch moves common XML parsing code to nft_mxml_num_parse(). To handle this, the nft_strtoi() helper fuction is included. I've changed some MXML_DESCEND[_FIRST] flags to avoid match a nested node under some circumstances, ie, matching two nodes with the same name that are descendant. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/expr/limit.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'src/expr/limit.c') diff --git a/src/expr/limit.c b/src/expr/limit.c index 2ecf7cb..27f880c 100644 --- a/src/expr/limit.c +++ b/src/expr/limit.c @@ -122,32 +122,17 @@ static int nft_rule_expr_limit_xml_parse(struct nft_rule_expr *e, mxml_node_t *t { #ifdef XML_PARSING struct nft_expr_limit *limit = nft_expr_data(e); - mxml_node_t *node = NULL; - uint64_t tmp; - char *endptr; - node = mxmlFindElement(tree, tree, "rate", NULL, NULL, - MXML_DESCEND_FIRST); - if (node == NULL) + if (nft_mxml_num_parse(tree, "rate", MXML_DESCEND_FIRST, BASE_DEC, + &limit->rate, NFT_TYPE_U64) != 0) goto err; - tmp = strtoull(node->child->value.opaque, &endptr, 10); - if (tmp > UINT64_MAX || tmp < 0 || *endptr) - goto err; - - limit->rate = tmp; e->flags |= (1 << NFT_EXPR_LIMIT_RATE); - node = mxmlFindElement(tree, tree, "depth", NULL, NULL, - MXML_DESCEND); - if (node == NULL) - goto err; - - tmp = strtoull(node->child->value.opaque, &endptr, 10); - if (tmp > UINT64_MAX || tmp < 0 || *endptr) + if (nft_mxml_num_parse(tree, "depth", MXML_DESCEND_FIRST, BASE_DEC, + &limit->rate, NFT_TYPE_U64) != 0) goto err; - limit->depth = tmp; e->flags |= (1 << NFT_EXPR_LIMIT_DEPTH); return 0; -- cgit v1.2.3