Patchwork [libnftables,1/2] src: delete exporting internal flags in XML

login
register
mail settings
Submitter Arturo Borrero
Date April 29, 2013, 12:36 p.m.
Message ID <20130429123607.26114.18073.stgit@nfdev.cica.es>
Download mbox | patch
Permalink /patch/240363/
State Accepted
Headers show

Comments

Arturo Borrero - April 29, 2013, 12:36 p.m.
The uint32_t flags attribute is internal, so no need to export/import in XML.

Signed-off-by: Arturo Borrero González <arturo.borrero.glez@gmail.com>
---
 src/chain.c |    5 ++---
 src/table.c |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pablo Neira - May 3, 2013, 4:22 p.m.
On Mon, Apr 29, 2013 at 02:36:07PM +0200, Arturo Borrero wrote:
> The uint32_t flags attribute is internal, so no need to
> export/import in XML.

Applied, thanks Arturo.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/src/chain.c b/src/chain.c
index fb5d218..44a0e66 100644
--- a/src/chain.c
+++ b/src/chain.c
@@ -452,7 +452,6 @@  static int nft_chain_snprintf_xml(char *buf, size_t size, struct nft_chain *c)
 		"<chain name=\"%s\" handle=\"%lu\""
 			" bytes=\"%lu\" packets=\"%lu\">"
 			"<properties>"
-				"<flags>%d</flags>"
 				"<type>%s</type>"
 				"<table>%s</table>"
 				"<prio>%d</prio>"
@@ -463,8 +462,8 @@  static int nft_chain_snprintf_xml(char *buf, size_t size, struct nft_chain *c)
 			"</properties>"
 		"</chain>",
 			c->name, c->handle, c->bytes, c->packets,
-			c->flags, c->type, c->table, c->prio,
-			c->use, c->hooknum, c->policy, c->family);
+			c->type, c->table, c->prio, c->use, c->hooknum,
+			c->policy, c->family);
 }
 
 static int nft_chain_snprintf_default(char *buf, size_t size, struct nft_chain *c)
diff --git a/src/table.c b/src/table.c
index 2d72136..8adaba8 100644
--- a/src/table.c
+++ b/src/table.c
@@ -188,11 +188,10 @@  static int nft_table_snprintf_xml(char *buf, size_t size, struct nft_table *t)
 			"<table name=\"%s\">"
 				"<properties>"
 					"<family>%u</family>"
-					"<flags>%d</flags>"
 					"<table_flags>%d</table_flags>"
 				"</properties>"
 			"</table>" ,
-			t->name, t->family, t->flags, t->table_flags);
+			t->name, t->family, t->table_flags);
 }
 
 static int nft_table_snprintf_default(char *buf, size_t size, struct nft_table *t)