diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-04 16:10:24 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-04 16:47:58 +0200 |
| commit | 556fb7ee694a0f18cbd3d73ac96b27c74081bd6d (patch) | |
| tree | a5148ca080d15ea122473186baacc3fd5bd2138c /src/expr/meta.c | |
| parent | d844fa06e43bc80487acfe5647cef4d4994c95fd (diff) | |
src: consolidate XML parsing of expressions via nft_mxml_reg_parse
This patch reduces the XML code in 100 LOC.
Diffstat (limited to 'src/expr/meta.c')
| -rw-r--r-- | src/expr/meta.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/expr/meta.c b/src/expr/meta.c index 46a863a..b1d978b 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -174,24 +174,14 @@ static int nft_rule_expr_meta_xml_parse(struct nft_rule_expr *e, mxml_node_t *tr #ifdef XML_PARSING struct nft_expr_meta *meta = (struct nft_expr_meta *)e->data; mxml_node_t *node = NULL; - uint64_t tmp; - char *endptr; + int32_t reg; int key; - /* Get and set <dreg>. Is mandatory */ - node = mxmlFindElement(tree, tree, "dreg", NULL, NULL, - MXML_DESCEND_FIRST); - if (node == NULL) - return -1; - - tmp = strtoull(node->child->value.opaque, &endptr, 10); - if (tmp > UINT8_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; - meta->dreg = (uint8_t)tmp; + meta->dreg = reg; e->flags |= (1 << NFT_EXPR_META_DREG); /* Get and set <key>. Is mandatory */ |