From ffb16b9416d5a77520388fc5c12ccd0570726e57 Mon Sep 17 00:00:00 2001 From: Arturo Borrero Date: Sat, 6 Jul 2013 02:39:52 +0200 Subject: set: add xml output This patch adds XML output for sets. Signed-off-by: Arturo Borrero Gonzalez Signed-off-by: Pablo Neira Ayuso --- src/set.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) (limited to 'src/set.c') diff --git a/src/set.c b/src/set.c index 4f2e8a5..dc3bd27 100644 --- a/src/set.c +++ b/src/set.c @@ -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, + "", + s->name, s->table, NFT_SET_XML_VERSION); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf+offset, size, "%s" + "%u" + "%u" + "%u" + "%u" + "%u", + 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, ""); + 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: -- cgit v1.2.3