From d844fa06e43bc80487acfe5647cef4d4994c95fd Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 4 Jul 2013 14:50:22 +0200 Subject: 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 --- src/mxml.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/mxml.c (limited to 'src/mxml.c') diff --git a/src/mxml.c b/src/mxml.c new file mode 100644 index 0000000..76fb05f --- /dev/null +++ b/src/mxml.c @@ -0,0 +1,55 @@ +/* + * (C) 2012-2013 by Pablo Neira Ayuso + * (C) 2013 by Arturo Borrero Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This code has been sponsored by Sophos Astaro + */ +#include "internal.h" +#include "expr_ops.h" + +#include +#include +#include + +struct nft_rule_expr *nft_mxml_expr_parse(mxml_node_t *node) +{ + mxml_node_t *tree; + struct nft_rule_expr *e; + const char *expr_name; + char *xml_text; + int ret; + + expr_name = mxmlElementGetAttr(node, "type"); + if (expr_name == NULL) + goto err; + + e = nft_rule_expr_alloc(expr_name); + if (e == NULL) + goto err; + + xml_text = mxmlSaveAllocString(node, MXML_NO_CALLBACK); + if (xml_text == NULL) + goto err_expr; + + tree = mxmlLoadString(NULL, xml_text, MXML_OPAQUE_CALLBACK); + free(xml_text); + + if (tree == NULL) + goto err_expr; + + ret = e->ops->xml_parse(e, tree); + mxmlDelete(tree); + + return ret < 0 ? NULL : e; +err_expr: + nft_rule_expr_free(e); +err: + mxmlDelete(tree); + errno = EINVAL; + return NULL; +} -- cgit v1.2.3