From 2c9840880d2d1f4f58b950047bd3763b43375a31 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Wed, 4 Jun 2014 13:38:07 +0200 Subject: expr: reject: Add nft_rule_expr_reject_snprinf_* functions Code refactoring in nft_rule_expr_reject_snprinf functions. This process adds three new functions: * nft_rule_expr_reject_snprinf_default * nft_rule_expr_reject_snprinf_xml * nft_rule_expr_reject_snprinf_json Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/expr/reject.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) (limited to 'src/expr/reject.c') diff --git a/src/expr/reject.c b/src/expr/reject.c index 62346e9..aef1fd1 100644 --- a/src/expr/reject.c +++ b/src/expr/reject.c @@ -174,24 +174,46 @@ nft_rule_expr_reject_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, #endif } +static int nft_rule_expr_reject_snprintf_default(char *buf, size_t len, + struct nft_rule_expr *e) +{ + struct nft_expr_reject *reject = nft_expr_data(e); + + return snprintf(buf, len, "type %u code %u ", + reject->type, reject->icmp_code); +} + +static int nft_rule_expr_reject_snprintf_xml(char *buf, size_t len, + struct nft_rule_expr *e) +{ + struct nft_expr_reject *reject = nft_expr_data(e); + + return snprintf(buf, len, "%u" + "%u", + reject->type, reject->icmp_code); +} + +static int nft_rule_expr_reject_snprintf_json(char *buf, size_t len, + struct nft_rule_expr *e) +{ + struct nft_expr_reject *reject = nft_expr_data(e); + + return snprintf(buf, len, "\"type\":%u," + "\"code\":%u,", + reject->type, reject->icmp_code); +} + static int nft_rule_expr_reject_snprintf(char *buf, size_t len, uint32_t type, uint32_t flags, struct nft_rule_expr *e) { - struct nft_expr_reject *reject = nft_expr_data(e); - switch(type) { case NFT_OUTPUT_DEFAULT: - return snprintf(buf, len, "type %u code %u ", - reject->type, reject->icmp_code); + return nft_rule_expr_reject_snprintf_default(buf, len, e); case NFT_OUTPUT_XML: - return snprintf(buf, len, "%u" - "%u", - reject->type, reject->icmp_code); + return nft_rule_expr_reject_snprintf_xml(buf, len, e); case NFT_OUTPUT_JSON: - return snprintf(buf, len, "\"type\":%u," - "\"code\":%u,", - reject->type, reject->icmp_code); + return nft_rule_expr_reject_snprintf_json(buf, len, e); default: break; } -- cgit v1.2.3