diff options
author | Ana Rey <anarey@gmail.com> | 2014-06-11 17:50:48 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-11 19:19:56 +0200 |
commit | cbb40e407ed32c91a4d1d84eb7ad83401ce569c9 (patch) | |
tree | 8e19783d32130dd3f3be644ff340f21b14b18e1b /src/set.c | |
parent | 812456503eb4018219bf3641cd525d7b63883a0c (diff) |
src: set: Do not print unset values in xml
It changes the parse and the snprint functions to omit unset values.
This xml file is gotten for a set:
<set>
<family>unknown</family>
<table>test</table>
<name>miset</name>
<flags>0</flags>
<key_type>0</key_type>
<key_len>0</key_len>
<set_elem>
<flags>0</flags>
<key>
<data_reg type="value">
<len>4</len>
<data0>0x0401a8c0</data0>
</data_reg>
</key>
</set_elem>
<set_elem>
<flags>0</flags>
<key>
<data_reg type="value">
<len>4</len>
<data0>0x0501a8c0</data0>
</data_reg>
</key>
</set_elem>
</set>
Now, this xml file is gotten without unset values:
<set>
<family>unknown</family>
<table>test</table>
<name>miset</name>
<set_elem>
<key>
<data_reg type="value">
<len>4</len>
<data0>0x00000002</data0>
</data_reg>
</key>
</set_elem>
<set_elem>
<key>
<data_reg type="value">
<len>4</len>
<data0>0x0401a8c0</data0>
</data_reg>
</key>
</set_elem>
</set>
Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/set.c')
-rw-r--r-- | src/set.c | 80 |
1 files changed, 53 insertions, 27 deletions
@@ -471,19 +471,17 @@ int nft_mxml_set_parse(mxml_node_t *tree, struct nft_set *s, family = nft_mxml_family_parse(tree, "family", MXML_DESCEND_FIRST, NFT_XML_MAND, err); - if (family < 0) - return -1; - nft_set_attr_set_u32(s, NFT_SET_ATTR_FAMILY, family); + if (family >= 0) + nft_set_attr_set_u32(s, NFT_SET_ATTR_FAMILY, family); if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND_FIRST, BASE_DEC, - &set_flags, NFT_TYPE_U32, NFT_XML_MAND, err) < 0) - return -1; - nft_set_attr_set_u32(s, NFT_SET_ATTR_FLAGS, set_flags); + &set_flags, NFT_TYPE_U32, NFT_XML_MAND, + err) == 0) + nft_set_attr_set_u32(s, NFT_SET_ATTR_FLAGS, set_flags); if (nft_mxml_num_parse(tree, "key_type", MXML_DESCEND_FIRST, BASE_DEC, - &key_type, NFT_TYPE_U32, NFT_XML_MAND, err) < 0) - return -1; - nft_set_attr_set_u32(s, NFT_SET_ATTR_KEY_TYPE, key_type); + &key_type, NFT_TYPE_U32, NFT_XML_MAND, err) == 0) + nft_set_attr_set_u32(s, NFT_SET_ATTR_KEY_TYPE, key_type); if (nft_mxml_num_parse(tree, "key_len", MXML_DESCEND_FIRST, BASE_DEC, &key_len, NFT_TYPE_U32, NFT_XML_MAND, err) < 0) @@ -497,9 +495,8 @@ int nft_mxml_set_parse(mxml_node_t *tree, struct nft_set *s, if (nft_mxml_num_parse(tree, "data_len", MXML_DESCEND_FIRST, BASE_DEC, &data_len, NFT_TYPE_U32, - NFT_XML_MAND, err) < 0) - return -1; - nft_set_attr_set_u32(s, NFT_SET_ATTR_DATA_LEN, data_len); + NFT_XML_MAND, err) == 0) + nft_set_attr_set_u32(s, NFT_SET_ATTR_DATA_LEN, data_len); } @@ -668,34 +665,63 @@ 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, len, "<set><family>%s</family>" - "<table>%s</table>" - "<name>%s</name>" - "<flags>%u</flags>" - "<key_type>%u</key_type>" - "<key_len>%u</key_len>", - nft_family2str(s->family), s->table, s->name, - s->set_flags, s->key_type, s->key_len); + ret = snprintf(buf, len, "<set>"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - if (s->flags & (1 << NFT_SET_ATTR_DATA_TYPE) && - s->flags & (1 << NFT_SET_ATTR_DATA_LEN)) { - ret = snprintf(buf+offset, len, "<data_type>%u</data_type>" - "<data_len>%u</data_len>", - s->data_type, s->data_len); + if (s->flags & (1 << NFT_SET_ATTR_FAMILY)) { + ret = snprintf(buf + offset, len, "<family>%s</family>", + nft_family2str(s->family)); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + if (s->flags & (1 << NFT_SET_ATTR_TABLE)) { + ret = snprintf(buf + offset, len, "<table>%s</table>", + s->table); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + if (s->flags & (1 << NFT_SET_ATTR_NAME)) { + ret = snprintf(buf + offset, len, "<name>%s</name>", + s->name); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (s->flags & (1 << NFT_SET_ATTR_FLAGS)) { + ret = snprintf(buf + offset, len, "<flags>%u</flags>", + s->set_flags); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (s->flags & (1 << NFT_SET_ATTR_KEY_TYPE)) { + ret = snprintf(buf + offset, len, "<key_type>%u</key_type>", + s->key_type); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (s->flags & (1 << NFT_SET_ATTR_KEY_LEN)) { + ret = snprintf(buf + offset, len, "<key_len>%u</key_len>", + s->key_len); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + if (s->flags & (1 << NFT_SET_ATTR_DATA_TYPE)) { + ret = snprintf(buf + offset, len, "<data_type>%u</data_type>", + s->data_type); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (s->flags & (1 << NFT_SET_ATTR_DATA_LEN)) { + ret = snprintf(buf + offset, len, "<data_len>%u</data_len>", + 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, len, elem, + ret = nft_set_elem_snprintf(buf + offset, len, elem, NFT_OUTPUT_XML, flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } } - ret = snprintf(buf+offset, len, "</set>"); + ret = snprintf(buf + offset, len, "</set>"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); return offset; |