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_elem.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_elem.c')
-rw-r--r-- | src/set_elem.c | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/src/set_elem.c b/src/set_elem.c index 9d1dc41..d954cb8 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -386,15 +386,12 @@ int nft_mxml_set_elem_parse(mxml_node_t *tree, struct nft_set_elem *e, if (nft_mxml_num_parse(tree, "flags", MXML_DESCEND_FIRST, BASE_DEC, &set_elem_flags, NFT_TYPE_U32, NFT_XML_MAND, - err) < 0) - return -1; - nft_set_elem_attr_set_u32(e, NFT_SET_ELEM_ATTR_FLAGS, set_elem_flags); + err) == 0) + nft_set_elem_attr_set_u32(e, NFT_SET_ELEM_ATTR_FLAGS, set_elem_flags); if (nft_mxml_data_reg_parse(tree, "key", &e->key, - NFT_XML_MAND, err) != DATA_VALUE) - return -1; - - e->flags |= (1 << NFT_SET_ELEM_ATTR_KEY); + NFT_XML_MAND, err) == DATA_VALUE) + e->flags |= (1 << NFT_SET_ELEM_ATTR_KEY); /* <set_elem_data> is not mandatory */ set_elem_data = nft_mxml_data_reg_parse(tree, "data", @@ -563,17 +560,26 @@ static int nft_set_elem_snprintf_xml(char *buf, size_t size, { int ret, len = size, offset = 0, type = DATA_NONE; - ret = snprintf(buf, size, "<set_elem>" - "<flags>%u</flags><key>", - e->set_elem_flags); + ret = snprintf(buf, size, "<set_elem>"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = nft_data_reg_snprintf(buf+offset, len, &e->key, - NFT_OUTPUT_XML, flags, DATA_VALUE); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (e->flags & (1 << NFT_SET_ELEM_ATTR_FLAGS)) { + ret = snprintf(buf + offset, size, "<flags>%u</flags>", + e->set_elem_flags); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } - ret = snprintf(buf+offset, len, "</key>"); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (e->flags & (1 << NFT_SET_ELEM_ATTR_KEY)) { + ret = snprintf(buf + offset, len, "<key>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = nft_data_reg_snprintf(buf + offset, len, &e->key, + NFT_OUTPUT_XML, flags, DATA_VALUE); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + + ret = snprintf(buf + offset, len, "</key>"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } if (e->flags & (1 << NFT_SET_ELEM_ATTR_DATA)) type = DATA_VALUE; @@ -583,18 +589,18 @@ static int nft_set_elem_snprintf_xml(char *buf, size_t size, type = DATA_VERDICT; if (type != DATA_NONE) { - ret = snprintf(buf+offset, len, "<data>"); + ret = snprintf(buf + offset, len, "<data>"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = nft_data_reg_snprintf(buf+offset, len, &e->data, + ret = nft_data_reg_snprintf(buf + offset, len, &e->data, NFT_OUTPUT_XML, flags, type); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = snprintf(buf+offset, len, "</data>"); + ret = snprintf(buf + offset, len, "</data>"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - ret = snprintf(buf+offset, len, "</set_elem>"); + ret = snprintf(buf + offset, len, "</set_elem>"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); return offset; |