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/data_reg.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/data_reg.c')
| -rw-r--r-- | src/expr/data_reg.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index 34537a7..fd1dd2e 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c @@ -133,7 +133,8 @@ static int nft_data_reg_verdict_xml_parse(union nft_data_reg *reg, char *xml) } /* Get and set <verdict> */ - verdict_str = nft_mxml_str_parse(tree, "verdict", MXML_DESCEND); + verdict_str = nft_mxml_str_parse(tree, "verdict", MXML_DESCEND, + NFT_XML_MAND); if (verdict_str == NULL) { mxmlDelete(tree); return -1; @@ -183,7 +184,8 @@ static int nft_data_reg_chain_xml_parse(union nft_data_reg *reg, char *xml) if (reg->chain) xfree(reg->chain); - reg->chain = nft_mxml_str_parse(tree, "chain", MXML_DESCEND); + reg->chain = nft_mxml_str_parse(tree, "chain", MXML_DESCEND, + NFT_XML_MAND); if (reg->chain == NULL) { mxmlDelete(tree); return -1; @@ -234,7 +236,7 @@ static int nft_data_reg_value_xml_parse(union nft_data_reg *reg, char *xml) } if (nft_mxml_num_parse(tree, "len", MXML_DESCEND, BASE_DEC, ®->len, - NFT_TYPE_U8) != 0) { + NFT_TYPE_U8, NFT_XML_MAND) != 0) { mxmlDelete(tree); return -1; } @@ -244,7 +246,8 @@ static int nft_data_reg_value_xml_parse(union nft_data_reg *reg, char *xml) sprintf(node_name, "data%d", i); if (nft_mxml_num_parse(tree, node_name, MXML_DESCEND, BASE_HEX, - ®->val[i], NFT_TYPE_U32) != 0) { + ®->val[i], NFT_TYPE_U32, + NFT_XML_MAND) != 0) { mxmlDelete(tree); return -1; } |