diff options
author | Arturo Borrero <arturo.borrero.glez@gmail.com> | 2013-07-06 02:39:52 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-06 15:29:52 +0200 |
commit | ffb16b9416d5a77520388fc5c12ccd0570726e57 (patch) | |
tree | 7ac546f7b15a3140e71f007071d0b5fa31e96ff8 /src | |
parent | 1e8e5d4b55efe4f11334a5b55483b802cb704071 (diff) |
set: add xml output
This patch adds XML output for sets.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/internal.h | 1 | ||||
-rw-r--r-- | src/set.c | 43 | ||||
-rw-r--r-- | src/set_elem.c | 65 |
3 files changed, 106 insertions, 3 deletions
diff --git a/src/internal.h b/src/internal.h index d5d41bd..803dcc4 100644 --- a/src/internal.h +++ b/src/internal.h @@ -24,6 +24,7 @@ int nft_mxml_data_reg_parse(mxml_node_t *tree, const char *node_name, union nft_ #define NFT_TABLE_XML_VERSION 0 #define NFT_CHAIN_XML_VERSION 0 #define NFT_RULE_XML_VERSION 0 +#define NFT_SET_XML_VERSION 0 #define NFT_TABLE_JSON_VERSION 0 #define NFT_CHAIN_JSON_VERSION 0 #define NFT_RULE_JSON_VERSION 0 @@ -355,7 +355,7 @@ static int nft_set_snprintf_json(char *buf, size_t size, struct nft_set *s, } static int nft_set_snprintf_default(char *buf, size_t size, struct nft_set *s, - uint32_t type, uint32_t flags) + uint32_t type, uint32_t flags) { int ret; int len = size, offset = 0; @@ -383,12 +383,51 @@ static int nft_set_snprintf_default(char *buf, size_t size, struct nft_set *s, return offset; } +static int nft_set_snprintf_xml(char *buf, size_t size, struct nft_set *s, + uint32_t flags) +{ + int ret; + int len = size, offset = 0; + struct nft_set_elem *elem; + + ret = snprintf(buf, size, + "<set name=\"%s\" table=\"%s\" version=\"%d\">", + s->name, s->table, NFT_SET_XML_VERSION); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, size, "<family>%s</family>" + "<set_flags>%u</set_flags>" + "<key_type>%u</key_type>" + "<key_len>%u</key_len>" + "<data_type>%u</data_type>" + "<data_len>%u</data_len>", + nft_family2str(s->family), + s->set_flags, s->key_type, s->key_len, + s->data_type, s->data_len); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + if (!list_empty(&s->element_list)) { + list_for_each_entry(elem, &s->element_list, head) { + ret = nft_set_elem_snprintf(buf+offset, size, elem, + NFT_SET_O_XML, flags); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + } + + ret = snprintf(buf+offset, size, "</set>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + return offset; +} + int nft_set_snprintf(char *buf, size_t size, struct nft_set *s, - uint32_t type, uint32_t flags) + uint32_t type, uint32_t flags) { switch(type) { case NFT_SET_O_DEFAULT: return nft_set_snprintf_default(buf, size, s, type, flags); + case NFT_SET_O_XML: + return nft_set_snprintf_xml(buf, size, s, flags); case NFT_SET_O_JSON: return nft_set_snprintf_json(buf, size, s, type, flags); default: diff --git a/src/set_elem.c b/src/set_elem.c index c5c3de4..3966cd6 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -22,6 +22,7 @@ #include <linux/netfilter/nf_tables.h> #include <libnftables/set.h> +#include <libnftables/rule.h> #include "linux_list.h" #include "expr/data_reg.h" @@ -418,7 +419,8 @@ static int nft_set_elem_snprintf_json(char *buf, size_t size, struct nft_set_ele return offset; } -static int nft_set_elem_snprintf_default(char *buf, size_t size, struct nft_set_elem *e) +static int nft_set_elem_snprintf_default(char *buf, size_t size, + struct nft_set_elem *e) { int ret, len = size, offset = 0, i; @@ -444,12 +446,73 @@ static int nft_set_elem_snprintf_default(char *buf, size_t size, struct nft_set_ return offset; } +static int nft_set_elem_snprintf_xml(char *buf, size_t size, + struct nft_set_elem *e, uint32_t flags) +{ + int ret, len = size, offset = 0; + + ret = snprintf(buf, size, "<set_elem>" + "<set_elem_flags>%u</set_elem_flags>", + e->set_elem_flags); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, size, "<set_elem_key>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = nft_data_reg_snprintf(buf+offset, len, &e->key, + NFT_RULE_O_XML, flags, DATA_VALUE); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, size, "</set_elem_key>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + if (e->flags & (1 << NFT_SET_ELEM_ATTR_DATA)) { + ret = snprintf(buf+offset, size, "<set_elem_data>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = nft_data_reg_snprintf(buf+offset, len, &e->data, + NFT_RULE_O_XML, flags, DATA_VALUE); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, size, "</set_elem_data>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } else if (e->flags & (1 << NFT_SET_ELEM_ATTR_VERDICT)) { + ret = snprintf(buf+offset, size, "<set_elem_data>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = nft_data_reg_snprintf(buf+offset, len, &e->data, + NFT_RULE_O_XML, flags, + DATA_VERDICT); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, size, "</set_elem_data>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } else if (e->flags & (1 << NFT_SET_ELEM_ATTR_CHAIN)) { + ret = snprintf(buf+offset, size, "<set_elem_data>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = nft_data_reg_snprintf(buf+offset, len, &e->data, + NFT_RULE_O_XML, flags, DATA_CHAIN); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, size, "</set_elem_data>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + ret = snprintf(buf+offset, size, "</set_elem>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + return offset; +} + int nft_set_elem_snprintf(char *buf, size_t size, struct nft_set_elem *e, uint32_t type, uint32_t flags) { switch(type) { case NFT_SET_O_DEFAULT: return nft_set_elem_snprintf_default(buf, size, e); + case NFT_SET_O_XML: + return nft_set_elem_snprintf_xml(buf, size, e, flags); case NFT_SET_O_JSON: return nft_set_elem_snprintf_json(buf, size, e); default: |