From ed9108662cfc31eede854197484e2641b4ab76d2 Mon Sep 17 00:00:00 2001
From: Ana Rey <anarey@gmail.com>
Date: Thu, 29 May 2014 13:26:39 +0200
Subject: expr: log: Code refactoring in nft_rule_expr_log_snprintf

This process adds three new functions:

* nft_rule_expr_log_snprintf_default
* nft_rule_expr_log_snprintf_xml
* nft_rule_expr_log_snprintf_json

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/expr/log.c | 58 ++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 18 deletions(-)

(limited to 'src/expr/log.c')

diff --git a/src/expr/log.c b/src/expr/log.c
index 5119c20..a61a8d3 100644
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -243,32 +243,54 @@ static int nft_rule_expr_log_xml_parse(struct nft_rule_expr *e,
 #endif
 }
 
+static int nft_rule_expr_log_snprintf_default(char *buf, size_t len,
+					      struct nft_rule_expr *e)
+{
+	struct nft_expr_log *log = nft_expr_data(e);
+
+	return snprintf(buf, len, "prefix '%s' group %u snaplen %u"
+				  "qthreshold %u ",
+			log->prefix, log->group, log->snaplen, log->qthreshold);
+}
+
+static int nft_rule_expr_log_snprintf_xml(char *buf, size_t size,
+					  struct nft_rule_expr *e)
+{
+	struct nft_expr_log *log = nft_expr_data(e);
+
+	return snprintf(buf, size, "<prefix>%s</prefix>"
+				   "<group>%u</group>"
+				   "<snaplen>%u</snaplen>"
+				   "<qthreshold>%u</qthreshold>",
+			log->prefix, log->group,
+			log->snaplen, log->qthreshold);
+}
+
+static int nft_rule_expr_log_snprintf_json(char *buf, size_t len,
+					   struct nft_rule_expr *e)
+{
+	struct nft_expr_log *log = nft_expr_data(e);
+
+	return snprintf(buf, len, "\"prefix\":\"%s\","
+				  "\"group\":%u,"
+				  "\"snaplen\":%u,"
+				  "\"qthreshold\":%u",
+			log->prefix, log->group,
+			log->snaplen, log->qthreshold);
+}
+
+
 static int
 nft_rule_expr_log_snprintf(char *buf, size_t len, uint32_t type,
 			    uint32_t flags, struct nft_rule_expr *e)
 {
-	struct nft_expr_log *log = nft_expr_data(e);
-
 	switch(type) {
 	case NFT_OUTPUT_DEFAULT:
-		return snprintf(buf, len, "prefix '%s' group %u "
-					  "snaplen %u qthreshold %u ",
-				log->prefix, log->group,
-				log->snaplen, log->qthreshold);
+		return nft_rule_expr_log_snprintf_default(buf, len, e);
 	case NFT_OUTPUT_XML:
-		return snprintf(buf, len, "<prefix>%s</prefix>"
-					  "<group>%u</group>"
-					  "<snaplen>%u</snaplen>"
-					  "<qthreshold>%u</qthreshold>",
-				log->prefix, log->group,
-				log->snaplen, log->qthreshold);
+		return nft_rule_expr_log_snprintf_xml(buf, len, e);
 	case NFT_OUTPUT_JSON:
-		return snprintf(buf, len, "\"prefix\":\"%s\","
-					  "\"group\":%u,"
-					  "\"snaplen\":%u,"
-					  "\"qthreshold\":%u",
-				log->prefix, log->group,
-				log->snaplen, log->qthreshold);
+		return nft_rule_expr_log_snprintf_json(buf, len, e);
 	default:
 		break;
 	}
-- 
cgit v1.2.3