netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ana Rey <anarey@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: Ana Rey <anarey@gmail.com>
Subject: [libnftnl PATCH 1/5] expr: reject: Add nft_rule_expr_reject_snprinf_* functions
Date: Wed,  4 Jun 2014 13:38:07 +0200	[thread overview]
Message-ID: <1401881891-4990-2-git-send-email-anarey@gmail.com> (raw)
In-Reply-To: <1401881891-4990-1-git-send-email-anarey@gmail.com>

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(-)

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;
 	}
-- 
2.0.0.rc2


  reply	other threads:[~2014-06-04 11:38 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-04 11:38 [libnftnl PATCH 0/5] reject: Do not print unset value Ana Rey
2014-06-04 11:38 ` Ana Rey [this message]
2014-06-05 13:19   ` [libnftnl PATCH 1/5] expr: reject: Add nft_rule_expr_reject_snprinf_* functions Pablo Neira Ayuso
2014-06-04 11:38 ` [libnftnl PATCH 2/5] expr: reject: Use nft_rule_expr_set_* in the xml and default parsing code Ana Rey
2014-06-05 13:19   ` Pablo Neira Ayuso
2014-06-04 11:38 ` [libnftnl PATCH 3/5] expr: reject: Do not print unset values in xml Ana Rey
2014-06-05 13:19   ` Pablo Neira Ayuso
2014-06-04 11:38 ` [libnftnl PATCH 4/5] expr: reject: Convert the type of a variable Ana Rey
2014-06-05 13:20   ` Pablo Neira Ayuso
2014-06-04 11:38 ` [libnftnl PATCH 5/5] expr: reject: Do not print unset values in json Ana Rey
2014-06-05 13:20   ` Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1401881891-4990-2-git-send-email-anarey@gmail.com \
    --to=anarey@gmail.com \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).