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/meta.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/meta.c')
| -rw-r--r-- | src/expr/meta.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/expr/meta.c b/src/expr/meta.c index 4a7a83a..ac01732 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -163,7 +163,7 @@ static int nft_rule_expr_meta_xml_parse(struct nft_rule_expr *e, mxml_node_t *tr { #ifdef XML_PARSING struct nft_expr_meta *meta = nft_expr_data(e); - mxml_node_t *node = NULL; + const char *key_str; int32_t reg; int key; @@ -174,12 +174,11 @@ static int nft_rule_expr_meta_xml_parse(struct nft_rule_expr *e, mxml_node_t *tr meta->dreg = reg; e->flags |= (1 << NFT_EXPR_META_DREG); - /* Get and set <key>. Is mandatory */ - node = mxmlFindElement(tree, tree, "key", NULL, NULL, MXML_DESCEND); - if (node == NULL) + key_str = nft_mxml_str_parse(tree, "key", MXML_DESCEND_FIRST); + if (key_str == NULL) return -1; - key = str2meta_key(node->child->value.opaque); + key = str2meta_key(key_str); if (key < 0) return -1; |