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/cmp.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/cmp.c')
| -rw-r--r-- | src/expr/cmp.c | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/src/expr/cmp.c b/src/expr/cmp.c index 0a7c9e2..291ebcd 100644 --- a/src/expr/cmp.c +++ b/src/expr/cmp.c @@ -158,7 +158,7 @@ static int nft_rule_expr_cmp_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre { #ifdef XML_PARSING struct nft_expr_cmp *cmp = nft_expr_data(e); - mxml_node_t *node = NULL; + const char *op; int32_t reg; reg = nft_mxml_reg_parse(tree, "sreg", MXML_DESCEND_FIRST); @@ -168,27 +168,26 @@ static int nft_rule_expr_cmp_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre cmp->sreg = reg; e->flags |= (1 << NFT_EXPR_CMP_SREG); - /* Get and set <op>. Is not mandatory*/ - node = mxmlFindElement(tree, tree, "op", NULL, NULL, MXML_DESCEND); - if (node != NULL) { - if (strcmp(node->child->value.opaque, "eq") == 0) { - cmp->op = NFT_CMP_EQ; - } else if (strcmp(node->child->value.opaque, "neq") == 0) { - cmp->op = NFT_CMP_NEQ; - } else if (strcmp(node->child->value.opaque, "lt") == 0) { - cmp->op = NFT_CMP_LT; - } else if (strcmp(node->child->value.opaque, "lte") == 0) { - cmp->op = NFT_CMP_LTE; - } else if (strcmp(node->child->value.opaque, "gt") == 0) { - cmp->op = NFT_CMP_GT; - } else if (strcmp(node->child->value.opaque, "gte") == 0) { - cmp->op = NFT_CMP_GTE; - } else { - /* If <op> is present, a valid value is mandatory */ - return -1; - } - e->flags |= (1 << NFT_EXPR_CMP_OP); - } + op = nft_mxml_str_parse(tree, "op", MXML_DESCEND_FIRST); + if (op == NULL) + return -1; + + if (strcmp(op, "eq") == 0) + cmp->op = NFT_CMP_EQ; + else if (strcmp(op, "neq") == 0) + cmp->op = NFT_CMP_NEQ; + else if (strcmp(op, "lt") == 0) + cmp->op = NFT_CMP_LT; + else if (strcmp(op, "lte") == 0) + cmp->op = NFT_CMP_LTE; + else if (strcmp(op, "gt") == 0) + cmp->op = NFT_CMP_GT; + else if (strcmp(op, "gte") == 0) + cmp->op = NFT_CMP_GTE; + else + return -1; + + e->flags |= (1 << NFT_EXPR_CMP_OP); if (nft_mxml_data_reg_parse(tree, "cmpdata", &cmp->data) != DATA_VALUE) { |