diff options
| author | Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> | 2013-09-13 14:05:51 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-09-16 12:47:41 +0200 |
| commit | f4befc129827632209779c71d804f6139ac03541 (patch) | |
| tree | a6eee54267a676aed33de92089102cba694d2415 /src/expr/bitwise.c | |
| parent | 8281648cab5a9189fdb0806c0f3801d6ffebef9a (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/bitwise.c')
| -rw-r--r-- | src/expr/bitwise.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index 11738a7..9d521b1 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -246,18 +246,20 @@ nft_rule_expr_bitwise_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree) e->flags |= (1 << NFT_EXPR_BITWISE_DREG); if (nft_mxml_num_parse(tree, "len", MXML_DESCEND_FIRST, - BASE_DEC, &bitwise->len, NFT_TYPE_U8) != 0) + BASE_DEC, &bitwise->len, NFT_TYPE_U8, + NFT_XML_MAND) != 0) return -1; e->flags |= (1 << NFT_EXPR_BITWISE_LEN); - if (nft_mxml_data_reg_parse(tree, "mask", - &bitwise->mask) != DATA_VALUE) + if (nft_mxml_data_reg_parse(tree, "mask", &bitwise->mask, + NFT_XML_MAND) != DATA_VALUE) return -1; e->flags |= (1 << NFT_EXPR_BITWISE_MASK); - if (nft_mxml_data_reg_parse(tree, "xor", &bitwise->xor) != DATA_VALUE) + if (nft_mxml_data_reg_parse(tree, "xor", &bitwise->xor, + NFT_XML_MAND) != DATA_VALUE) return -1; e->flags |= (1 << NFT_EXPR_BITWISE_XOR); |