summaryrefslogtreecommitdiffstats
path: root/src/expr/cmp.c
diff options
context:
space:
mode:
authorArturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>2013-09-13 14:05:51 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2013-09-16 12:47:41 +0200
commitf4befc129827632209779c71d804f6139ac03541 (patch)
treea6eee54267a676aed33de92089102cba694d2415 /src/expr/cmp.c
parent8281648cab5a9189fdb0806c0f3801d6ffebef9a (diff)
src: xml: add parsing optional/mandatory flag
Add an optional/mandatory flag to XML parsing. In some elements (ie regs), no flag is used because is always mandatory. DATA_NONE is created to indicate a non-parsed data_reg. Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/cmp.c')
-rw-r--r--src/expr/cmp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 543f774..b9f0f6a 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -224,7 +224,7 @@ 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);
- op = nft_mxml_str_parse(tree, "op", MXML_DESCEND_FIRST);
+ op = nft_mxml_str_parse(tree, "op", MXML_DESCEND_FIRST, NFT_XML_MAND);
if (op == NULL)
return -1;
@@ -236,9 +236,9 @@ static int nft_rule_expr_cmp_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre
e->flags |= (1 << NFT_EXPR_CMP_OP);
if (nft_mxml_data_reg_parse(tree, "cmpdata",
- &cmp->data) != DATA_VALUE) {
+ &cmp->data, NFT_XML_MAND) != DATA_VALUE)
return -1;
- }
+
e->flags |= (1 << NFT_EXPR_CMP_DATA);
return 0;