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/log.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/log.c')
| -rw-r--r-- | src/expr/log.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/expr/log.c b/src/expr/log.c index 90fb32e..feb4184 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -202,7 +202,8 @@ static int nft_rule_expr_log_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre struct nft_expr_log *log = nft_expr_data(e); const char *prefix; - prefix = nft_mxml_str_parse(tree, "prefix", MXML_DESCEND_FIRST); + prefix = nft_mxml_str_parse(tree, "prefix", MXML_DESCEND_FIRST, + NFT_XML_MAND); if (prefix == NULL) return -1; @@ -210,19 +211,20 @@ static int nft_rule_expr_log_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre e->flags |= (1 << NFT_EXPR_LOG_PREFIX); if (nft_mxml_num_parse(tree, "group", MXML_DESCEND_FIRST, BASE_DEC, - &log->group, NFT_TYPE_U16) != 0) + &log->group, NFT_TYPE_U16, NFT_XML_MAND) != 0) return -1; e->flags |= (1 << NFT_EXPR_LOG_GROUP); if (nft_mxml_num_parse(tree, "snaplen", MXML_DESCEND_FIRST, BASE_DEC, - &log->snaplen, NFT_TYPE_U32) != 0) + &log->snaplen, NFT_TYPE_U32, NFT_XML_MAND) != 0) return -1; e->flags |= (1 << NFT_EXPR_LOG_SNAPLEN); if (nft_mxml_num_parse(tree, "qthreshold", MXML_DESCEND_FIRST, - BASE_DEC, &log->qthreshold, NFT_TYPE_U16) != 0) + BASE_DEC, &log->qthreshold, + NFT_TYPE_U16, NFT_XML_MAND) != 0) return -1; e->flags |= (1 << NFT_EXPR_LOG_QTHRESHOLD); |