From 15ad64734a544a9af033e54d232f112971072c15 Mon Sep 17 00:00:00 2001 From: Alvaro Neira Ayuso Date: Mon, 9 Feb 2015 21:09:53 +0100 Subject: src: add command tag in JSON/XML export support Currently, we can't do incremental updates via JSON/XML. This patch enriches the existing output to indicate the kind of update that you want to perform. So, if we have a ruleset like: table ip filter { chain input { type filter hook input priority 0; } } The new output looks like: {"nftables":[{"add":[{"table":{"name":"filter",...}}]}]} ^^^^^ Where we explicitly indicate that we want to add a table. We support all the actions that we can do with nft, they are: - Add, delete and flush tables and chains. - Add, delete, replace and insert rules. - Add and delete sets. - Add and delete set elements. - Flush ruleset. You only need to add the command tag: {"nftables":[{"delete":[{...}, {...},...}]}]} ^^^^^^^^ The possible command tags that you can use are "add", "delete", "insert", "replace" and "flush". - Flush table or chain, eg.: {"nftables":[{"flush":[{"table":{"name":...}}]}]} - Delete table, chain, set or rule: {"nftables":[{"delete":[{"chain":{"name":...}]}]} - Replace a rule (you have to specify the handle): {"nftables":[{"replace":[{"rule":{...}}]}]} - Insert a rule: {"nftables":[{"insert":[{"rule":{...}}]}]} Signed-off-by: Alvaro Neira Ayuso Signed-off-by: Pablo Neira Ayuso --- src/chain.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'src/chain.c') diff --git a/src/chain.c b/src/chain.c index 26ad14d..84851e0 100644 --- a/src/chain.c +++ b/src/chain.c @@ -847,12 +847,12 @@ static int nft_chain_snprintf_default(char *buf, size_t size, return offset; } -int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *c, - uint32_t type, uint32_t flags) +static int nft_chain_cmd_snprintf(char *buf, size_t size, struct nft_chain *c, + uint32_t cmd, uint32_t type, uint32_t flags) { int ret, len = size, offset = 0; - ret = nft_event_header_snprintf(buf+offset, len, type, flags); + ret = nft_cmd_header_snprintf(buf + offset, len, cmd, type, flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); switch (type) { @@ -869,15 +869,23 @@ int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *c, SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = nft_event_footer_snprintf(buf+offset, len, type, flags); + ret = nft_cmd_footer_snprintf(buf + offset, len, cmd, type, flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); return offset; } + +int nft_chain_snprintf(char *buf, size_t size, struct nft_chain *c, + uint32_t type, uint32_t flags) +{ + return nft_chain_cmd_snprintf(buf, size, c, nft_flag2cmd(flags), type, + flags); +} EXPORT_SYMBOL(nft_chain_snprintf); static inline int nft_chain_do_snprintf(char *buf, size_t size, void *c, - uint32_t type, uint32_t flags) + uint32_t cmd, uint32_t type, + uint32_t flags) { return nft_chain_snprintf(buf, size, c, type, flags); } @@ -885,7 +893,8 @@ static inline int nft_chain_do_snprintf(char *buf, size_t size, void *c, int nft_chain_fprintf(FILE *fp, struct nft_chain *c, uint32_t type, uint32_t flags) { - return nft_fprintf(fp, c, type, flags, nft_chain_do_snprintf); + return nft_fprintf(fp, c, NFT_CMD_UNSPEC, type, flags, + nft_chain_do_snprintf); } EXPORT_SYMBOL(nft_chain_fprintf); -- cgit v1.2.3