From fc7d496788b8abb3f009b73898508032eced0c6c Mon Sep 17 00:00:00 2001
From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Date: Tue, 6 Aug 2013 12:52:45 +0200
Subject: src: xml: delete unneeded XML prefixes

This patch changes some XML nodes with prefixes, as the example below
ilustrates.

Before:
<rule>
	<rule_flags/>
	<rule_family/>
<rule>

After:
<rule>
	<flags>
	<family>
</rule>

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/rule.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/rule.c')

diff --git a/src/rule.c b/src/rule.c
index c223272..9d6a996 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -533,7 +533,7 @@ static int nft_rule_xml_parse(struct nft_rule *r, char *xml)
 	r->flags |= (1 << NFT_RULE_ATTR_HANDLE);
 
 	/* get and set <rule_flags> */
-	if (nft_mxml_num_parse(tree, "rule_flags", MXML_DESCEND_FIRST,
+	if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND_FIRST,
 			       BASE_DEC, &r->rule_flags, NFT_TYPE_U32) != 0) {
 		mxmlDelete(tree);
 		return -1;
@@ -669,13 +669,9 @@ static int nft_rule_snprintf_xml(char *buf, size_t size, struct nft_rule *r,
 
 	ret = snprintf(buf, size, "<rule><family>%s</family>"
 		       "<table>%s</table><chain>%s</chain>"
-		       "<handle>%llu</handle>",
+		       "<handle>%llu</handle><flags>%u</flags>",
 		       nft_family2str(r->family), r->table, r->chain,
-		       (unsigned long long)r->handle);
-	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
-
-	ret = snprintf(buf+offset, len, "<rule_flags>%u</rule_flags>",
-		       r->rule_flags);
+		       (unsigned long long)r->handle, r->rule_flags);
 	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
 	if (r->compat.flags != 0 || r->compat.proto != 0) {
-- 
cgit v1.2.3