summaryrefslogtreecommitdiffstats
path: root/src/expr/cmp.c
diff options
context:
space:
mode:
authorAna Rey <anarey@gmail.com>2014-06-19 19:34:22 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2014-06-23 19:54:46 +0200
commit54ec205d112c911a92db57e822b86aa590345a12 (patch)
treeb692abe14594ae681a9af483d4335a1bd826def1 /src/expr/cmp.c
parent224d91bfc79ea8d6868560f55ec301c71b5805dd (diff)
expr: cmp: Use nft_rule_expr_set_* in the xml parsing code
Code refactoring to use nft_rule_expr_cmp_* in parse functions. Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/cmp.c')
-rw-r--r--src/expr/cmp.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index b21fa9d..cc01573 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -218,14 +218,12 @@ static int nft_rule_expr_cmp_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre
struct nft_expr_cmp *cmp = nft_expr_data(e);
const char *op;
int32_t op_value;
- uint32_t reg;
+ uint32_t sreg;
- if (nft_mxml_reg_parse(tree, "sreg", &reg, MXML_DESCEND_FIRST,
+ if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST,
NFT_XML_MAND, err) != 0)
return -1;
-
- cmp->sreg = reg;
- e->flags |= (1 << NFT_EXPR_CMP_SREG);
+ nft_rule_expr_set_u32(e, NFT_EXPR_CMP_SREG, sreg);
op = nft_mxml_str_parse(tree, "op", MXML_DESCEND_FIRST, NFT_XML_MAND,
err);
@@ -235,9 +233,7 @@ static int nft_rule_expr_cmp_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre
op_value = nft_str2cmp(op);
if (op_value < 0)
return -1;
-
- cmp->op = op_value;
- e->flags |= (1 << NFT_EXPR_CMP_OP);
+ nft_rule_expr_set_u32(e, NFT_EXPR_CMP_OP, op_value);
if (nft_mxml_data_reg_parse(tree, "cmpdata",
&cmp->data, NFT_XML_MAND,