From f4befc129827632209779c71d804f6139ac03541 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Fri, 13 Sep 2013 14:05:51 +0200 Subject: 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 Signed-off-by: Pablo Neira Ayuso --- src/expr/bitwise.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/expr/bitwise.c') 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); -- cgit v1.2.3