From 556fb7ee694a0f18cbd3d73ac96b27c74081bd6d Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 4 Jul 2013 16:10:24 +0200 Subject: src: consolidate XML parsing of expressions via nft_mxml_reg_parse This patch reduces the XML code in 100 LOC. --- src/expr/payload.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'src/expr/payload.c') diff --git a/src/expr/payload.c b/src/expr/payload.c index 8866755..7d6fb6d 100644 --- a/src/expr/payload.c +++ b/src/expr/payload.c @@ -203,22 +203,15 @@ nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree) struct nft_expr_payload *payload = (struct nft_expr_payload *)e->data; mxml_node_t *node = NULL; uint64_t tmp; + int32_t reg; char *endptr; - /* Get and set . Not mandatory */ - node = mxmlFindElement(tree, tree, "dreg", NULL, NULL, - MXML_DESCEND_FIRST); - if (node != NULL) { - tmp = strtoull(node->child->value.opaque, &endptr, 10); - if (tmp > UINT32_MAX || tmp < 0 || *endptr) - return -1; - - if (tmp > NFT_REG_MAX) - return -1; + reg = nft_mxml_reg_parse(tree, "dreg", MXML_DESCEND_FIRST); + if (reg < 0) + return -1; - payload->dreg = (uint32_t)tmp; - e->flags |= (1 << NFT_EXPR_PAYLOAD_DREG); - } + payload->dreg = reg; + e->flags |= (1 << NFT_EXPR_PAYLOAD_DREG); /* Get and set . Not mandatory */ node = mxmlFindElement(tree, tree, "base", NULL, NULL, MXML_DESCEND); -- cgit v1.2.3