[libnftables PATCH 0/2] Series short description

[libnftables PATCH 0/2] Series short description

[Alvaro Neira]

The following series implements...

I collapsed the patches. Now, you can compile libnftables without error if you apply the patch.

I hope everything is correct.

Thanks for all.

---

Alvaro Neira (2):
      Add functions for exporting tables to JSON format
      Add implementation for to proof the JSON export function


 examples/nft-table-get.c    |    4 ++++
 include/libnftables/table.h |    1 +
 src/internal.h              |    1 +
 src/table.c                 |   18 ++++++++++++++++++
 4 files changed, 24 insertions(+)

-- 
Álvaro Neira Ayuso
--
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

[libnftables PATCH 1/2] Add functions for exporting tables to JSON format

[Alvaro Neira]

---
 include/libnftables/table.h |    1 +
 src/internal.h              |    1 +
 src/table.c                 |   18 ++++++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/include/libnftables/table.h b/include/libnftables/table.h
index 658230c..19f322c 100644
--- a/include/libnftables/table.h
+++ b/include/libnftables/table.h
@@ -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 {
diff --git a/src/internal.h b/src/internal.h
index 3ad5e89..0c5de21 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -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;
 
diff --git a/src/table.c b/src/table.c
index a868da4..de106bb 100644
--- a/src/table.c
+++ b/src/table.c
@@ -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:

[libnftables PATCH 2/2] Add implementation for to proof the JSON export function

[Alvaro Neira]

---
 examples/nft-table-get.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/examples/nft-table-get.c b/examples/nft-table-get.c
index b113636..0d7746c 100644
--- a/examples/nft-table-get.c
+++ b/examples/nft-table-get.c
@@ -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--;
 	}

Re: [libnftables PATCH 1/2] Add functions for exporting tables to JSON format

[Pablo Neira Ayuso]

Applied, thanks Alvaro.

Re: [libnftables PATCH 2/2] Add implementation for to proof the JSON export function

[Pablo Neira Ayuso]

Also applied, thanks.

On Fri, Jun 07, 2013 at 11:14:23AM +0200, Alvaro Neira wrote:
> 
> ---
>  examples/nft-table-get.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/examples/nft-table-get.c b/examples/nft-table-get.c
> index b113636..0d7746c 100644
> --- a/examples/nft-table-get.c
> +++ b/examples/nft-table-get.c
> @@ -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--;
>  	}
> 
> --
> 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