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/table.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/table.c')
| -rw-r--r-- | src/table.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/table.c b/src/table.c index 838c5ee..0b51d15 100644 --- a/src/table.c +++ b/src/table.c @@ -232,7 +232,8 @@ static int nft_table_xml_parse(struct nft_table *t, const char *xml) if (strcmp(tree->value.opaque, "table") != 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; @@ -242,7 +243,8 @@ static int nft_table_xml_parse(struct nft_table *t, const char *xml) t->name = strdup(name); t->flags |= (1 << NFT_TABLE_ATTR_NAME); - 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; @@ -250,7 +252,8 @@ static int nft_table_xml_parse(struct nft_table *t, const char *xml) t->flags |= (1 << NFT_TABLE_ATTR_FAMILY); if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND, BASE_DEC, - &t->table_flags, NFT_TYPE_U32) != 0) + &t->table_flags, NFT_TYPE_U32, + NFT_XML_MAND) != 0) goto err; t->flags |= (1 << NFT_TABLE_ATTR_FLAGS); |