diff options
| author | Arturo Borrero <arturo.borrero.glez@gmail.com> | 2013-07-26 14:11:07 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-07-26 14:42:48 +0200 |
| commit | 986c098a1b7c3329d66a60838c1b304c993063f8 (patch) | |
| tree | 5cb349e7065e70f849125d20d0f75b540ca088a9 /src/set.c | |
| parent | e4206c8c5b2cfe9dcdf92d3f0379414909dff299 (diff) | |
set: xml: change XML attributes to nodes.
This patch changes all XML attributes to XML nodes in nft_set.
In order to avoid issues regarding XML nodes with the same name but
different meanings, I've followed this pattern for the new elements:
<set>
<set_table>string</set_table>
<set_name>string</set_name>
[...]
</set>
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/set.c')
| -rw-r--r-- | src/set.c | 26 |
1 files changed, 12 insertions, 14 deletions
@@ -386,20 +386,18 @@ static int nft_set_snprintf_xml(char *buf, size_t size, struct nft_set *s, 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); + ret = snprintf(buf, size, "<set><family>%s</family>" + "<set_table>%s</set_table>" + "<set_name>%s</set_name>" + "<set_xml_version>%d</set_xml_version>" + "<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->table, s->name, + NFT_SET_XML_VERSION, 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)) { |