src: consolidate XML parsing of expressions via nft_mxml_expr_parse

Move common code for XML parsing of expressions to the new
nft_mxml_expr_parse function.

This patch reduces the XML parsing code in 300 LOC.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

1 files changed, 5 insertions, 30 deletions

diff --git a/src/expr/payload.c b/src/expr/payload.c
index 2111c47..8866755 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -197,43 +197,24 @@ nft_rule_expr_payload_snprintf_json(char *buf, size_t len, uint32_t flags,
 }
 
 static int
-nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, char *xml)
+nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree)
 {
 #ifdef XML_PARSING
 	struct nft_expr_payload *payload = (struct nft_expr_payload *)e->data;
-	mxml_node_t *tree = NULL;
 	mxml_node_t *node = NULL;
 	uint64_t tmp;
 	char *endptr;
 
-	tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK);
-	if (tree == NULL)
-		return -1;
-
-	if (mxmlElementGetAttr(tree, "type") == NULL) {
-		mxmlDelete(tree);
-		return -1;
-	}
-
-	if (strcmp("payload", mxmlElementGetAttr(tree, "type")) != 0) {
-		mxmlDelete(tree);
-		return -1;
-	}
-
 	/* Get and set <dreg>. 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) {
-			mxmlDelete(tree);
+		if (tmp > UINT32_MAX || tmp < 0 || *endptr)
 			return -1;
-		}
 
-		if (tmp > NFT_REG_MAX) {
-			mxmlDelete(tree);
+		if (tmp > NFT_REG_MAX)
 			return -1;
-		}
 
 		payload->dreg = (uint32_t)tmp;
 		e->flags |= (1 << NFT_EXPR_PAYLOAD_DREG);
@@ -251,7 +232,6 @@ nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, char *xml)
 				  "transport") == 0) {
 			payload->base = NFT_PAYLOAD_TRANSPORT_HEADER;
 		} else {
-			mxmlDelete(tree);
 			return -1;
 		}
 
@@ -263,10 +243,8 @@ nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, char *xml)
 			       MXML_DESCEND);
 	if (node != NULL) {
 		tmp = strtoull(node->child->value.opaque, &endptr, 10);
-		if (tmp > UINT_MAX || tmp < 0 || *endptr) {
-			mxmlDelete(tree);
+		if (tmp > UINT_MAX || tmp < 0 || *endptr)
 			return -1;
-		}
 
 		payload->offset = (unsigned int)tmp;
 		e->flags |= (1 << NFT_EXPR_PAYLOAD_OFFSET);
@@ -276,15 +254,12 @@ nft_rule_expr_payload_xml_parse(struct nft_rule_expr *e, char *xml)
 	node = mxmlFindElement(tree, tree, "len", NULL, NULL, MXML_DESCEND);
 	if (node != NULL) {
 		tmp = strtoull(node->child->value.opaque, &endptr, 10);
-		if (tmp > UINT_MAX || tmp < 0 || *endptr) {
-			mxmlDelete(tree);
+		if (tmp > UINT_MAX || tmp < 0 || *endptr)
 			return -1;
-		}
 
 		payload->len = (unsigned int)tmp;
 		e->flags |= (1 << NFT_EXPR_PAYLOAD_LEN);
 	}
-	mxmlDelete(tree);
 	return 0;
 #else
 	errno = EOPNOTSUPP;