diff options
Diffstat (limited to 'src/expr/bitwise.c')
| -rw-r--r-- | src/expr/bitwise.c | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index 4b48392..6b534b4 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -204,38 +204,21 @@ nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree) struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data; mxml_node_t *node = NULL; mxml_node_t *save = NULL; - uint64_t tmp; + int32_t reg; union nft_data_reg data_regtmp; - char *endptr = NULL; - /* get and set <sreg> */ - node = mxmlFindElement(tree, tree, "sreg", NULL, NULL, - MXML_DESCEND_FIRST); - if (node == NULL) - return -1; - - tmp = strtoull(node->child->value.opaque, &endptr, 10); - if (tmp > UINT32_MAX || tmp < 0 || *endptr) - return -1; - - if (tmp > NFT_REG_MAX) + reg = nft_mxml_reg_parse(tree, "sreg", MXML_DESCEND_FIRST); + if (reg < 0) return -1; - bitwise->sreg = (uint32_t)tmp; + bitwise->sreg = reg; e->flags |= (1 << NFT_EXPR_BITWISE_SREG); - /* get and set <dreg> */ - node = mxmlFindElement(tree, tree, "dreg", NULL, NULL, MXML_DESCEND); - if (node == NULL) - return -1; - tmp = strtoull(node->child->value.opaque, &endptr, 10); - if (tmp > UINT32_MAX || tmp < 0 || *endptr) - return -1; - - if (tmp > NFT_REG_MAX) + reg = nft_mxml_reg_parse(tree, "dreg", MXML_DESCEND); + if (reg < 0) return -1; - bitwise->dreg = (uint32_t)tmp; + bitwise->dreg = reg; e->flags |= (1 << NFT_EXPR_BITWISE_DREG); /* Get and set <mask> */ |