diff mbox

[libnftnl,1/5] expr: reject: Add nft_rule_expr_reject_snprinf_* functions

Message ID 1401881891-4990-2-git-send-email-anarey@gmail.com
State Accepted
Headers show

Commit Message

Ana Rey June 4, 2014, 11:38 a.m. UTC 
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 <anarey@gmail.com>
---
 src/expr/reject.c | 42 ++++++++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 10 deletions(-)

Comments

Pablo Neira Ayuso June 5, 2014, 1:19 p.m. UTC | #1 
On Wed, Jun 04, 2014 at 01:38:07PM +0200, Ana Rey wrote:
> 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

Applied with minor changes.

> Signed-off-by: Ana Rey <anarey@gmail.com>
> ---
>  src/expr/reject.c | 42 ++++++++++++++++++++++++++++++++----------
>  1 file changed, 32 insertions(+), 10 deletions(-)
> 
> diff --git a/src/expr/reject.c b/src/expr/reject.c
> index 62346e9..cefaf98 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  ",
                                                   ^
removed extra whitespace. Not your fault, but good to fix it now that
we're just passing by this code.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/src/expr/reject.c b/src/expr/reject.c
index 62346e9..cefaf98 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, "<type>%u</type>"
+				  "<code>%u</code>",
+			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, "<type>%u</type>"
-					  "<code>%u</code>",
-				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;
 	}