diff options
| author | Arturo Borrero <arturo.borrero.glez@gmail.com> | 2013-07-25 18:46:35 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-25 20:03:21 +0200 |
| commit | e13819c5f5b6138c4c7e01156d0fd9f58b11702d (patch) | |
| tree | c4bbc0256f537099a8233915597419843359793b /src/table.c | |
| parent | 3ebc57b84c227fcfc55545af85e246ab4cad2041 (diff) | |
src: xml: consolidate common XML code via nft_mxml_num_parse
This patch moves common XML parsing code to nft_mxml_num_parse().
To handle this, the nft_strtoi() helper fuction is included.
I've changed some MXML_DESCEND[_FIRST] flags to avoid match a nested node under
some circumstances, ie, matching two nodes with the same name that are descendant.
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 | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/table.c b/src/table.c index e9e6d59..d814668 100644 --- a/src/table.c +++ b/src/table.c @@ -224,7 +224,6 @@ static int nft_table_xml_parse(struct nft_table *t, char *xml) mxml_node_t *tree = NULL; mxml_node_t *node = NULL; char *endptr = NULL; - uint64_t tmp; int64_t stmp; int family; @@ -280,20 +279,12 @@ static int nft_table_xml_parse(struct nft_table *t, char *xml) t->flags |= (1 << NFT_TABLE_ATTR_FAMILY); /* Get and set <table_flags> */ - node = mxmlFindElement(tree, tree, "table_flags", NULL, NULL, - MXML_DESCEND); - if (node == NULL) { - mxmlDelete(tree); - return -1; - } - - tmp = strtoull(node->child->value.opaque, &endptr, 10); - if (tmp > UINT32_MAX || *endptr || tmp < 0) { + if (nft_mxml_num_parse(tree, "table_flags", MXML_DESCEND, BASE_DEC, + &t->table_flags, NFT_TYPE_U32) != 0) { mxmlDelete(tree); return -1; } - t->table_flags = (uint32_t)tmp; t->flags |= (1 << NFT_TABLE_ATTR_FLAGS); mxmlDelete(tree); |