From: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: anarey@gmail.com, pablo@netfilter.org
Subject: [libnftnl PATCH] expr: nat: add helper function to translate nat types to string
Date: Fri, 20 Jun 2014 10:55:08 +0200 [thread overview]
Message-ID: <20140620085508.12697.41817.stgit@nfdev.cica.es> (raw)
This patch adds a helper functon to translate nat types to string.
Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
src/expr/nat.c | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/src/expr/nat.c b/src/expr/nat.c
index 0136fca..c719b6c 100644
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -184,6 +184,18 @@ nft_rule_expr_nat_build(struct nlmsghdr *nlh, struct nft_rule_expr *e)
htonl(nat->sreg_proto_max));
}
+static inline const char *nft_nat2str(uint16_t nat)
+{
+ switch (nat) {
+ case NFT_NAT_SNAT:
+ return "snat";
+ case NFT_NAT_DNAT:
+ return "dnat";
+ default:
+ return "unknown";
+ }
+}
+
static inline int nft_str2nat(const char *nat)
{
if (strcmp(nat, "snat") == 0)
@@ -304,11 +316,8 @@ nft_rule_expr_nat_snprintf_json(char *buf, size_t size,
struct nft_expr_nat *nat = nft_expr_data(e);
int len = size, offset = 0, ret = 0;
- if (nat->type == NFT_NAT_SNAT)
- ret = snprintf(buf, len, "\"nat_type\":\"snat\",");
- else if (nat->type == NFT_NAT_DNAT)
- ret = snprintf(buf, len, "\"nat_type\":\"dnat\",");
-
+ ret = snprintf(buf, len, "\"nat_type\":\"%s\",",
+ nft_nat2str(nat->type));
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
ret = snprintf(buf+offset, len, "\"family\":\"%s\",",
@@ -340,14 +349,7 @@ nft_rule_expr_nat_snprintf_xml(char *buf, size_t size,
struct nft_expr_nat *nat = nft_expr_data(e);
int len = size, offset = 0, ret = 0;
- /* Is a mandatory element. Provide a default, even empty */
- if (nat->type == NFT_NAT_SNAT)
- ret = snprintf(buf, len, "<type>snat</type>");
- else if (nat->type == NFT_NAT_DNAT)
- ret = snprintf(buf, len, "<type>dnat</type>");
- else
- ret = snprintf(buf, len, "<type>unknown</type>");
-
+ ret = snprintf(buf, len, "<type>%s</type>", nft_nat2str(nat->type));
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
ret = snprintf(buf+offset, len, "<family>%s</family>",
@@ -380,16 +382,8 @@ nft_rule_expr_nat_snprintf_default(char *buf, size_t size,
struct nft_expr_nat *nat = nft_expr_data(e);
int len = size, offset = 0, ret = 0;
- switch (nat->type) {
- case NFT_NAT_SNAT:
- ret = snprintf(buf, len, "snat ");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- break;
- case NFT_NAT_DNAT:
- ret = snprintf(buf, len, "dnat ");
- SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
- break;
- }
+ ret = snprintf(buf, len, "%s ", nft_nat2str(nat->type));
+ SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
ret = snprintf(buf+offset, len, "%s ", nft_family2str(nat->family));
SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
next reply other threads:[~2014-06-20 8:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-20 8:55 Arturo Borrero Gonzalez [this message]
2014-06-23 18:07 ` [libnftnl PATCH] expr: nat: add helper function to translate nat types to string 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=20140620085508.12697.41817.stgit@nfdev.cica.es \
--to=arturo.borrero.glez@gmail.com \
--cc=anarey@gmail.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.