diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-25 21:21:51 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-25 21:31:35 +0200 |
| commit | 3f994836f6bb124a5c0185ab6659ef7f57ceac5f (patch) | |
| tree | 42e568f80d1d47c5e01b1367e58a494c5dfa446e /src/expr/match.c | |
| parent | 1c86a5f0f9df07b66691115ba4b0a9ee0f978dd6 (diff) | |
src: xml: consolidate common XML code via nft_mxml_str_parse
This patch moves common XML string parsing code to nft_mxml_str_parse().
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/match.c')
| -rw-r--r-- | src/expr/match.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/expr/match.c b/src/expr/match.c index d7d9c5b..9eb31c5 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -174,17 +174,15 @@ static int nft_rule_expr_match_xml_parse(struct nft_rule_expr *e, mxml_node_t *t { #ifdef XML_PARSING struct nft_expr_match *mt = nft_expr_data(e); - mxml_node_t *node = NULL; - - /* get and set <name>. Not mandatory */ - node = mxmlFindElement(tree, tree, "name", NULL, NULL, - MXML_DESCEND_FIRST); - if (node != NULL) { - memcpy(mt->name, node->child->value.opaque, - XT_EXTENSION_MAXNAMELEN); - mt->name[XT_EXTENSION_MAXNAMELEN-1] = '\0'; - e->flags |= (1 << NFT_EXPR_MT_NAME); - } + const char *name; + + name = nft_mxml_str_parse(tree, "name", MXML_DESCEND_FIRST); + if (name == NULL) + return -1; + + strncpy(mt->name, name, XT_EXTENSION_MAXNAMELEN); + mt->name[XT_EXTENSION_MAXNAMELEN-1] = '\0'; + e->flags |= (1 << NFT_EXPR_MT_NAME); /* mt->info is ignored until other solution is reached */ |