diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-04 14:50:22 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-04 16:47:38 +0200 |
| commit | d844fa06e43bc80487acfe5647cef4d4994c95fd (patch) | |
| tree | 2dd70dc1b8889da6f566e467eeebdd13feafeabb /src/expr/target.c | |
| parent | 0dbe80fee352545f51bdc4fd71621223e8b62306 (diff) | |
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>
Diffstat (limited to 'src/expr/target.c')
| -rw-r--r-- | src/expr/target.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/expr/target.c b/src/expr/target.c index 0ad39d5..ba7ee1a 100644 --- a/src/expr/target.c +++ b/src/expr/target.c @@ -185,28 +185,12 @@ static int nft_rule_expr_target_parse(struct nft_rule_expr *e, struct nlattr *at } static int -nft_rule_expr_target_xml_parse(struct nft_rule_expr *e, char *xml) +nft_rule_expr_target_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree) { #ifdef XML_PARSING struct nft_expr_target *tg = (struct nft_expr_target *)e->data; - mxml_node_t *tree = NULL; mxml_node_t *node = NULL; - /* load the tree */ - tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); - if (tree == NULL) - return -1; - - if (mxmlElementGetAttr(tree, "type") == NULL) { - mxmlDelete(tree); - return -1; - } - - if (strcmp("target", mxmlElementGetAttr(tree, "type")) != 0) { - mxmlDelete(tree); - return -1; - } - /* Get and set <name>. Optional */ node = mxmlFindElement(tree, tree, "name", NULL, NULL, MXML_DESCEND_FIRST); @@ -219,7 +203,6 @@ nft_rule_expr_target_xml_parse(struct nft_rule_expr *e, char *xml) /* tg->info is ignored until other solution is reached */ - mxmlDelete(tree); return 0; #else errno = EOPNOTSUPP; |