From cbb40e407ed32c91a4d1d84eb7ad83401ce569c9 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Wed, 11 Jun 2014 17:50:48 +0200 Subject: 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: unknown test
miset 0 0 0 0 4 0x0401a8c0 0 4 0x0501a8c0 Now, this xml file is gotten without unset values: unknown test
miset 4 0x00000002 4 0x0401a8c0 Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/set.c | 80 ++++++++++++++++++++++++++++++++++++++-------------------- src/set_elem.c | 44 ++++++++++++++++++-------------- 2 files changed, 78 insertions(+), 46 deletions(-) diff --git a/src/set.c b/src/set.c index d1d176c..4fbc09f 100644 --- a/src/set.c +++ b/src/set.c @@ -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, "%s" - "%s
" - "%s" - "%u" - "%u" - "%u", - nft_family2str(s->family), s->table, s->name, - s->set_flags, s->key_type, s->key_len); + ret = snprintf(buf, len, ""); 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, "%u" - "%u", - s->data_type, s->data_len); + if (s->flags & (1 << NFT_SET_ATTR_FAMILY)) { + ret = snprintf(buf + offset, len, "%s", + nft_family2str(s->family)); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + if (s->flags & (1 << NFT_SET_ATTR_TABLE)) { + ret = snprintf(buf + offset, len, "%s
", + s->table); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + if (s->flags & (1 << NFT_SET_ATTR_NAME)) { + ret = snprintf(buf + offset, len, "%s", + s->name); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (s->flags & (1 << NFT_SET_ATTR_FLAGS)) { + ret = snprintf(buf + offset, len, "%u", + s->set_flags); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (s->flags & (1 << NFT_SET_ATTR_KEY_TYPE)) { + ret = snprintf(buf + offset, len, "%u", + s->key_type); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (s->flags & (1 << NFT_SET_ATTR_KEY_LEN)) { + ret = snprintf(buf + offset, len, "%u", + s->key_len); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + if (s->flags & (1 << NFT_SET_ATTR_DATA_TYPE)) { + ret = snprintf(buf + offset, len, "%u", + s->data_type); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (s->flags & (1 << NFT_SET_ATTR_DATA_LEN)) { + ret = snprintf(buf + offset, len, "%u", + 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, ""); + ret = snprintf(buf + offset, len, ""); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); return offset; 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); /* 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, "" - "%u", - e->set_elem_flags); + ret = snprintf(buf, size, ""); 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, "%u", + e->set_elem_flags); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } - ret = snprintf(buf+offset, len, ""); - SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + if (e->flags & (1 << NFT_SET_ELEM_ATTR_KEY)) { + ret = snprintf(buf + offset, len, ""); + 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, ""); + 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, ""); + ret = snprintf(buf + offset, len, ""); 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, ""); + ret = snprintf(buf + offset, len, ""); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } - ret = snprintf(buf+offset, len, ""); + ret = snprintf(buf + offset, len, ""); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); return offset; -- cgit v1.2.3