diff options
| author | Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com> | 2013-08-05 14:01:28 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-08-05 14:29:14 +0200 |
| commit | b3e73fda10db2b1aa2ef26690bf285839e4ea22a (patch) | |
| tree | 698e12091152ab0e59047566e50233c63cb0fbf6 /src/table.c | |
| parent | d7d29351d57864c2d71a5d83f9d7aae092e2b9e4 (diff) | |
src: xml: table/chain delete properties
This patch deletes the <properties> node in chain and table XML objects.
For this to work, the first tree search with MXML_DESCEND_FIRST flag is moved
to the next node.
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 | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/table.c b/src/table.c index 402e8c1..76a1b4b 100644 --- a/src/table.c +++ b/src/table.c @@ -244,12 +244,9 @@ static int nft_table_xml_parse(struct nft_table *t, char *xml) t->name = strdup(mxmlElementGetAttr(tree, "name")); t->flags |= (1 << NFT_TABLE_ATTR_NAME); - /* Ignore <properties> node */ - node = mxmlFindElement(tree, tree, "properties", NULL, NULL, - MXML_DESCEND_FIRST); - /* Get the and set <family> node */ - node = mxmlFindElement(tree, tree, "family", NULL, NULL, MXML_DESCEND); + node = mxmlFindElement(tree, tree, "family", NULL, NULL, + MXML_DESCEND_FIRST); if (node == NULL) { mxmlDelete(tree); return -1; @@ -363,13 +360,9 @@ static int nft_table_snprintf_json(char *buf, size_t size, struct nft_table *t) static int nft_table_snprintf_xml(char *buf, size_t size, struct nft_table *t) { - return snprintf(buf, size, "<table name=\"%s\">" - "<properties>" - "<family>%s</family>" - "<table_flags>%d</table_flags>" - "</properties>" - "</table>", - t->name, nft_family2str(t->family), t->table_flags); + return snprintf(buf, size, "<table name=\"%s\"><family>%s</family>" + "<table_flags>%d</table_flags></table>", + t->name, nft_family2str(t->family), t->table_flags); } static int nft_table_snprintf_default(char *buf, size_t size, struct nft_table *t) |