diff options
| author | Ana Rey <anarey@gmail.com> | 2014-06-24 09:15:37 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-24 10:43:20 +0200 |
| commit | 2249ea7623be56e11e24c4aaf4fff59852e50730 (patch) | |
| tree | 81d3d2389c2e9270e8dfcf2e879ce6868399fdb1 /src/expr/counter.c | |
| parent | 323efbbf90df64537a32cf9be230970b0b89d035 (diff) | |
expr: counter: Do not print unset values in xml
It changes the parse and the snprint functions to omit unset values.
Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/expr/counter.c')
| -rw-r--r-- | src/expr/counter.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/expr/counter.c b/src/expr/counter.c index 9d85a96..6f6a7ee 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c @@ -150,16 +150,12 @@ nft_rule_expr_counter_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, uint64_t pkts, bytes; if (nft_mxml_num_parse(tree, "pkts", MXML_DESCEND_FIRST, BASE_DEC, - &pkts, NFT_TYPE_U64, NFT_XML_MAND, - err) != 0) - return -1; - nft_rule_expr_set_u64(e, NFT_EXPR_CTR_PACKETS, pkts); + &pkts, NFT_TYPE_U64, NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u64(e, NFT_EXPR_CTR_PACKETS, pkts); if (nft_mxml_num_parse(tree, "bytes", MXML_DESCEND_FIRST, BASE_DEC, - &bytes, NFT_TYPE_U64, NFT_XML_MAND, - err) != 0) - return -1; - nft_rule_expr_set_u64(e, NFT_EXPR_CTR_BYTES, bytes); + &bytes, NFT_TYPE_U64, NFT_XML_MAND, err) == 0) + nft_rule_expr_set_u64(e, NFT_EXPR_CTR_BYTES, bytes); return 0; #else @@ -179,11 +175,20 @@ static int nft_rule_expr_counter_snprintf_json(char *buf, size_t len, static int nft_rule_expr_counter_snprintf_xml(char *buf, size_t len, struct nft_rule_expr *e) { + int ret, size = len, offset = 0; struct nft_expr_counter *ctr = nft_expr_data(e); - return snprintf(buf, len, "<pkts>%"PRIu64"</pkts>" - "<bytes>%"PRIu64"</bytes>", - ctr->pkts, ctr->bytes); + if (e->flags & (1 << NFT_EXPR_CTR_PACKETS)) { + ret = snprintf(buf, len, "<pkts>%"PRIu64"</pkts>", ctr->pkts); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + if (e->flags & (1 << NFT_EXPR_CTR_BYTES)) { + ret = snprintf(buf + offset, len, "<bytes>%"PRIu64"</bytes>", + ctr->bytes); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + } + + return offset; } static int nft_rule_expr_counter_snprintf_default(char *buf, size_t len, |