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/set.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/set.c')
| -rw-r--r-- | src/set.c | 29 |
1 files changed, 16 insertions, 13 deletions
@@ -427,7 +427,8 @@ static int nft_set_xml_parse(struct nft_set *s, const char *xml) if (strcmp(tree->value.opaque, "set") != 0) goto err; - name = nft_mxml_str_parse(tree, "name", MXML_DESCEND_FIRST); + name = nft_mxml_str_parse(tree, "name", MXML_DESCEND_FIRST, + NFT_XML_MAND); if (name == NULL) goto err; @@ -437,7 +438,8 @@ static int nft_set_xml_parse(struct nft_set *s, const char *xml) s->name = strdup(name); s->flags |= (1 << NFT_SET_ATTR_NAME); - table = nft_mxml_str_parse(tree, "table", MXML_DESCEND_FIRST); + table = nft_mxml_str_parse(tree, "table", MXML_DESCEND_FIRST, + NFT_XML_MAND); if (table == NULL) goto err; @@ -447,7 +449,8 @@ static int nft_set_xml_parse(struct nft_set *s, const char *xml) s->table = strdup(table); s->flags |= (1 << NFT_SET_ATTR_TABLE); - family = nft_mxml_family_parse(tree, "family", MXML_DESCEND_FIRST); + family = nft_mxml_family_parse(tree, "family", MXML_DESCEND_FIRST, + NFT_XML_MAND); if (family < 0) goto err; @@ -455,32 +458,32 @@ static int nft_set_xml_parse(struct nft_set *s, const char *xml) s->flags |= (1 << NFT_SET_ATTR_FAMILY); - if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND_FIRST, - BASE_DEC, &s->set_flags, NFT_TYPE_U32) != 0) + if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND_FIRST, BASE_DEC, + &s->set_flags, NFT_TYPE_U32, NFT_XML_MAND) != 0) goto err; s->flags |= (1 << NFT_SET_ATTR_FLAGS); - if (nft_mxml_num_parse(tree, "key_type", MXML_DESCEND_FIRST, - BASE_DEC, &s->key_type, NFT_TYPE_U32) != 0) + if (nft_mxml_num_parse(tree, "key_type", MXML_DESCEND_FIRST, BASE_DEC, + &s->key_type, NFT_TYPE_U32, NFT_XML_MAND) != 0) goto err; s->flags |= (1 << NFT_SET_ATTR_KEY_TYPE); - if (nft_mxml_num_parse(tree, "key_len", MXML_DESCEND_FIRST, - BASE_DEC, &s->key_len, NFT_TYPE_U32) != 0) + if (nft_mxml_num_parse(tree, "key_len", MXML_DESCEND_FIRST, BASE_DEC, + &s->key_len, NFT_TYPE_U32, NFT_XML_MAND) != 0) goto err; s->flags |= (1 << NFT_SET_ATTR_KEY_LEN); - if (nft_mxml_num_parse(tree, "data_type", MXML_DESCEND_FIRST, - BASE_DEC, &s->data_type, NFT_TYPE_U32) != 0) + if (nft_mxml_num_parse(tree, "data_type", MXML_DESCEND_FIRST, BASE_DEC, + &s->data_type, NFT_TYPE_U32, NFT_XML_MAND) != 0) goto err; s->flags |= (1 << NFT_SET_ATTR_DATA_TYPE); - if (nft_mxml_num_parse(tree, "data_len", MXML_DESCEND_FIRST, - BASE_DEC, &s->data_len, NFT_TYPE_U32) != 0) + if (nft_mxml_num_parse(tree, "data_len", MXML_DESCEND_FIRST, BASE_DEC, + &s->data_len, NFT_TYPE_U32, NFT_XML_MAND) != 0) goto err; s->flags |= (1 << NFT_SET_ATTR_DATA_LEN); |