From: Ana Rey <anarey@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: Ana Rey <anarey@gmail.com>
Subject: [libnftnl PATCH 1/4] expr: exthdr: Add nft_rule_expr_exthdr_snprinf_* functions
Date: Tue, 24 Jun 2014 14:33:44 +0200 [thread overview]
Message-ID: <1403613227-14134-2-git-send-email-anarey@gmail.com> (raw)
In-Reply-To: <1403613227-14134-1-git-send-email-anarey@gmail.com>
Code refactoring in nft_rule_expr_exthdr functions.
This patch adds three new functions:
* nft_rule_expr_exthdr_snprinf_default
* nft_rule_expr_exthdr_snprinf_xml
* nft_rule_expr_exthdr_snprinf_json
Signed-off-by: Ana Rey <anarey@gmail.com>
---
src/expr/exthdr.c | 56 +++++++++++++++++++++++++++++++++++++------------------
1 file changed, 38 insertions(+), 18 deletions(-)
diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index 66a6cf5..ad80826 100644
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -285,32 +285,52 @@ nft_rule_expr_exthdr_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
#endif
}
+static int nft_rule_expr_exthdr_snprintf_json(char *buf, size_t len,
+ struct nft_rule_expr *e)
+{
+ struct nft_expr_exthdr *exthdr = nft_expr_data(e);
+
+ return snprintf(buf, len, "\"dreg\":%u,"
+ "\"exthdr_type\":\"%s\",\"offset\":%u,"
+ "\"len\":%u",
+ exthdr->dreg, exthdr_type2str(exthdr->type),
+ exthdr->offset, exthdr->len);
+}
+
+static int nft_rule_expr_exthdr_snprintf_xml(char *buf, size_t len,
+ struct nft_rule_expr *e)
+{
+ struct nft_expr_exthdr *exthdr = nft_expr_data(e);
+
+ return snprintf(buf, len, "<dreg>%u</dreg>"
+ "<exthdr_type>%s</exthdr_type>"
+ "<offset>%u</offset>"
+ "<len>%u</len>",
+ exthdr->dreg, exthdr_type2str(exthdr->type),
+ exthdr->offset, exthdr->len);
+}
+
+static int nft_rule_expr_exthdr_snprintf_default(char *buf, size_t len,
+ struct nft_rule_expr *e)
+{
+ struct nft_expr_exthdr *exthdr = nft_expr_data(e);
+
+ return snprintf(buf, len, "load %ub @ %u + %u => reg %u ",
+ exthdr->len, exthdr->type, exthdr->offset,
+ exthdr->dreg);
+}
+
static int
nft_rule_expr_exthdr_snprintf(char *buf, size_t len, uint32_t type,
uint32_t flags, struct nft_rule_expr *e)
{
- struct nft_expr_exthdr *exthdr = nft_expr_data(e);
-
switch(type) {
case NFT_OUTPUT_DEFAULT:
- return snprintf(buf, len, "load %ub @ %u + %u => reg %u ",
- exthdr->len, exthdr->type,
- exthdr->offset, exthdr->dreg);
+ return nft_rule_expr_exthdr_snprintf_default(buf, len, e);
case NFT_OUTPUT_XML:
- return snprintf(buf, len, "<dreg>%u</dreg>"
- "<exthdr_type>%s</exthdr_type>"
- "<offset>%u</offset>"
- "<len>%u</len>",
- exthdr->dreg,
- exthdr_type2str(exthdr->type),
- exthdr->offset, exthdr->len);
+ return nft_rule_expr_exthdr_snprintf_xml(buf, len, e);
case NFT_OUTPUT_JSON:
- return snprintf(buf, len, "\"dreg\":%u,"
- "\"exthdr_type\":\"%s\",\"offset\":%u,"
- "\"len\":%u",
- exthdr->dreg,
- exthdr_type2str(exthdr->type),
- exthdr->offset, exthdr->len);
+ return nft_rule_expr_exthdr_snprintf_json(buf, len, e);
default:
break;
}
--
2.0.0
next prev parent reply other threads:[~2014-06-24 12:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-24 12:33 [libnftnl PATCH 0/4] expr: exthdr: Do not print unset values in xml and json Ana Rey
2014-06-24 12:33 ` Ana Rey [this message]
2014-06-24 12:33 ` [libnftnl PATCH 2/4] expr: exthdr: Use nft_rule_expr_set_* in the xml parsing code Ana Rey
2014-06-24 12:33 ` [libnftnl PATCH 3/4] expr: exthdr: Do not print unset values in xml Ana Rey
2014-06-24 12:33 ` [libnftnl PATCH 4/4] expr: exthdr: Do not print unset values in json Ana Rey
2014-06-24 17:15 ` [libnftnl PATCH 0/4] expr: exthdr: Do not print unset values in xml and json 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=1403613227-14134-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