diff options
| author | Arturo Borrero <arturo.borrero.glez@gmail.com> | 2013-07-05 16:28:06 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-06 00:11:55 +0200 |
| commit | 1e8e5d4b55efe4f11334a5b55483b802cb704071 (patch) | |
| tree | c9e948fca996743999917e7a55275432345728d5 /src/expr/bitwise.c | |
| parent | 9e540bd2dd2a53dc017f4ca6bd8b46bd4a3e5c65 (diff) | |
src: xml: consolidate parsing of data_reg via nft_mxml_data_reg_parse
Move common code for XML parsing of data_reg to the new
nft_mxml_data_reg_parse function.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/bitwise.c')
| -rw-r--r-- | src/expr/bitwise.c | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index e9176cd..67c120f 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -202,10 +202,7 @@ nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree) { #ifdef XML_PARSING struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data; - mxml_node_t *node = NULL; - mxml_node_t *save = NULL; int32_t reg; - union nft_data_reg data_regtmp; reg = nft_mxml_reg_parse(tree, "sreg", MXML_DESCEND_FIRST); if (reg < 0) @@ -221,39 +218,15 @@ nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree) bitwise->dreg = reg; e->flags |= (1 << NFT_EXPR_BITWISE_DREG); - /* Get and set <mask> */ - node = mxmlFindElement(tree, tree, "mask", NULL, NULL, - MXML_DESCEND); - if (node == NULL) + if (nft_mxml_data_reg_parse(tree, "mask", + &bitwise->mask) != DATA_VALUE) return -1; - /* hack for mxmSaveAllocString to print just the current node */ - save = node->next; - node->next = NULL; - if (nft_data_reg_xml_parse(&data_regtmp, - mxmlSaveAllocString(node, MXML_NO_CALLBACK)) < 0) - return -1; - node->next = save; - - memcpy(&bitwise->mask.val, data_regtmp.val, data_regtmp.len); - bitwise->mask.len = data_regtmp.len; e->flags |= (1 << NFT_EXPR_BITWISE_MASK); - /* Get and set <xor> */ - node = mxmlFindElement(tree, tree, "xor", NULL, NULL, - MXML_DESCEND); - if (node == NULL) - return -1; - - /* hack for mxmSaveAllocString to print just the current node */ - save = node->next; - node->next = NULL; - if (nft_data_reg_xml_parse(&data_regtmp, - mxmlSaveAllocString(node, MXML_NO_CALLBACK)) < 0) + if (nft_mxml_data_reg_parse(tree, "xor", &bitwise->xor) != DATA_VALUE) return -1; - memcpy(&bitwise->xor.val, data_regtmp.val, data_regtmp.len); - bitwise->xor.len = data_regtmp.len; e->flags |= (1 << NFT_EXPR_BITWISE_XOR); /* Additional validation: mask and xor must use the same number of |