Skip to contentSkip to conversation

Add functions for to export tables to JSON format

PATCH In review Alvaro Neira 2 participants 5 messages Jun 6, 2013 netfilter

lore
Share & tools
lore

Alvaro Neira

author
#0 lore raw

PATCH 1/4 Add functions for to export tables to JSON format

---

 0 files changed
src/table.c +18 -0
index a868da4..57ea586 100644
@@ -300,6 +300,22 @@ int nft_table_parse(struct nft_table *t, enum nft_table_parse_type type,
 }
 EXPORT_SYMBOL(nft_table_parse);
 
+static int nft_table_snprintf_json(char *buf, size_t size, struct nft_table *t)
+{
+	return snprintf(buf, size,
+			"{\"table\" : {"
+			"\"name\" : \"%s\","
+			"\"version\" : \"%d\","
+			"\"properties\" : {"
+				"\"family\" : %u,"
+				"\"table_flags\" : %d"
+				"}"
+			"}"
+			"}" ,
+			t->name, NFT_TABLE_JSON_VERSION,
+			t->family, t->table_flags);
+}
+
 static int nft_table_snprintf_xml(char *buf, size_t size, struct nft_table *t)
 {
 	return snprintf(buf, size,

@@ -325,6 +341,8 @@ int nft_table_snprintf(char *buf, size_t size, struct nft_table *t,
 	switch(type) {
 	case NFT_TABLE_O_XML:
 		return nft_table_snprintf_xml(buf, size, t);
+	case NFT_TABLE_O_JSON:
+		return nft_table_snprintf_json(buf, size, t);
 	case NFT_TABLE_O_DEFAULT:
 		return nft_table_snprintf_default(buf, size, t);
 	default:
author
#1 lore raw

PATCH 2/4 Add implementation for to proof the JSON export function

---
 examples/nft-table-get.c |    4 ++++
 1 file changed, 4 insertions(+)
examples/nft-table-get.c +4 -0
index b113636..0d7746c 100644
@@ -59,6 +59,10 @@ int main(int argc, char *argv[])
 		type = NFT_TABLE_O_XML;
 		argv[argc-1] = NULL;
 		argc--;
+	}else if (strcmp(argv[argc-1], "json") == 0) {
+		type = NFT_TABLE_O_JSON;
+		argv[argc-1] = NULL;
+		argc--;
 	} else if (strcmp(argv[argc - 1], "default") == 0) {
 		argc--;
 	}
author
#2 lore raw

PATCH 3/4 Add JSON Constant for to use the Json export function

In reply to Alvaro Neira

---

 0 files changed
include/libnftables/table.h +1 -0
index 658230c..19f322c 100644
@@ -31,6 +31,7 @@ void nft_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_table
 enum {
 	NFT_TABLE_O_DEFAULT	= 0,
 	NFT_TABLE_O_XML,
+	NFT_TABLE_O_JSON,
 };
 
 enum nft_table_parse_type {
maintainer
#3 lore raw

Re: [libnftables PATCH 3/4] Add JSON Constant for to use the Json export function

Hi Alvaro,

include/libnftables/table.h void nft_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_table · line 34

Quoted 13 lines · Alvaro Neira

---

 0 files changed
include/libnftables/table.h +1 -0
index 658230c..19f322c 100644
@@ -31,6 +31,7 @@ void nft_table_nlmsg_build_payload(struct nlmsghdr *nlh, const struct nft_table
 enum {
 	NFT_TABLE_O_DEFAULT	= 0,
 	NFT_TABLE_O_XML,
+	NFT_TABLE_O_JSON,

you have to collapse patch 1/4, 3/4 and 4/4. You cannot add the definition of this constant in a follow-up patch. Note that the repository has to remain consistent between patches, and after patch 1/4, if I compile libnftables, it would break.

Please, fix it and resubmit. Thanks.

author
#4 lore raw

PATCH 4/4 Add a constant for to put the JSON Version

In reply to Alvaro Neira

---

 0 files changed
src/internal.h +1 -0
index 3ad5e89..0c5de21 100644
@@ -20,6 +20,7 @@
 #define NFT_TABLE_XML_VERSION 0
 #define NFT_CHAIN_XML_VERSION 0
 #define NFT_RULE_XML_VERSION 0
+#define NFT_TABLE_JSON_VERSION 0
 
 struct expr_ops;