From 616b0ef39e2bc4d718c3fddafcdcce4bf1f7dd83 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Tue, 24 Jun 2014 09:15:35 +0200 Subject: expr: counter: Add nft_rule_expr_counter_snprinf_* functions Code refactoring in nft_rule_expr_counter_snprinf functions. This patch adds three new functions: * nft_rule_expr_counter_snprinf_default * nft_rule_expr_counter_snprinf_xml * nft_rule_expr_counter_snprinf_json Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/expr/counter.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/src/expr/counter.c b/src/expr/counter.c index 4bb7f1b..65acee3 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c @@ -169,23 +169,45 @@ nft_rule_expr_counter_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, return -1; #endif } +static int nft_rule_expr_counter_snprintf_json(char *buf, size_t len, + struct nft_rule_expr *e) +{ + struct nft_expr_counter *ctr = nft_expr_data(e); -static int -nft_rule_expr_counter_snprintf(char *buf, size_t len, uint32_t type, - uint32_t flags, struct nft_rule_expr *e) + return snprintf(buf, len, "\"pkts\":%"PRIu64",\"bytes\":%"PRIu64"", + ctr->pkts, ctr->bytes); +} + +static int nft_rule_expr_counter_snprintf_xml(char *buf, size_t len, + struct nft_rule_expr *e) { struct nft_expr_counter *ctr = nft_expr_data(e); + return snprintf(buf, len, "%"PRIu64"" + "%"PRIu64"", + ctr->pkts, ctr->bytes); +} + +static int nft_rule_expr_counter_snprintf_default(char *buf, size_t len, + struct nft_rule_expr *e) +{ + struct nft_expr_counter *ctr = nft_expr_data(e); + + return snprintf(buf, len, "pkts %"PRIu64" bytes %"PRIu64" ", + ctr->pkts, ctr->bytes); +} + +static int nft_rule_expr_counter_snprintf(char *buf, size_t len, uint32_t type, + uint32_t flags, + struct nft_rule_expr *e) +{ switch(type) { case NFT_OUTPUT_DEFAULT: - return snprintf(buf, len, "pkts %"PRIu64" bytes %"PRIu64" ", - ctr->pkts, ctr->bytes); + return nft_rule_expr_counter_snprintf_default(buf, len, e); case NFT_OUTPUT_XML: - return snprintf(buf, len, "%"PRIu64"%"PRIu64"", - ctr->pkts, ctr->bytes); + return nft_rule_expr_counter_snprintf_xml(buf, len, e); case NFT_OUTPUT_JSON: - return snprintf(buf, len, "\"pkts\":%"PRIu64",\"bytes\":%"PRIu64"", - ctr->pkts, ctr->bytes); + return nft_rule_expr_counter_snprintf_json(buf, len, e); default: break; } -- cgit v1.2.3