All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Roberto García" <rodanber@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: "Roberto García" <rodanber@gmail.com>
Subject: [PATCH] iptables: extensions: libxt_TEE: Add translation to nft
Date: Wed, 23 Mar 2016 12:42:52 +0100	[thread overview]
Message-ID: <1458733372-2543-1-git-send-email-rodanber@gmail.com> (raw)

Add translation for TEE target to nft. However, there is a
problem with the output when using ip6tables-translate. I couldn't find a fix
for that.

Examples:

$ iptables-translate -t mangle -A PREROUTING -j TEE --gateway 192.168.0.2 --oif
eth0

nft add rule ip mangle PREROUTING counter dup to 192.168.0.2 oif eth0

$ iptables-translate -t mangle -A PREROUTING -j TEE --gateway 192.168.0.2

nft add rule ip mangle PREROUTING counter dup to 192.168.0.2

$ ip6tables-translate -t mangle -A PREROUTING -j TEE --gateway
ab12:00a1:1112:acba::

nft add rule ip6 mangle PREROUTING counter comment \"��z\" dup to
ab12:a1:1112:acba::

$ ip6tables-translate -t mangle -A PREROUTING -j TEE --gateway
ab12:00a1:1112:acba:: --oif eth0

nft add rule ip6 mangle PREROUTING counter comment \"��{\" dup to
ab12:a1:1112:acba:: oif eth0

Signed-off-by: Roberto García <rodanber@gmail.com>
---
 extensions/libxt_TEE.c | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/extensions/libxt_TEE.c b/extensions/libxt_TEE.c
index 66c060d..0b6fb0d 100644
--- a/extensions/libxt_TEE.c
+++ b/extensions/libxt_TEE.c
@@ -92,6 +92,41 @@ static void tee_tg6_save(const void *ip, const struct xt_entry_target *target)
 		printf(" --oif %s", info->oif);
 }
 
+static int tee_tg_xlate(const void *ip, const struct xt_entry_target *target,
+			struct xt_xlate *xl, int numeric) 
+{
+	const struct xt_tee_tginfo *info =
+		(const void *)target->data;
+
+	if (numeric)
+		xt_xlate_add(xl, "dup to %s",
+			     xtables_ipaddr_to_numeric(&info->gw.in));
+	else
+		xt_xlate_add(xl, "dup to %s",
+			     xtables_ipaddr_to_anyname(&info->gw.in));
+	if (*info->oif != '\0')
+		xt_xlate_add(xl, " oif %s", info->oif);
+
+	return 1;
+}
+
+static int tee_tg6_xlate(const void *ip, const struct xt_entry_target *target,
+			 struct xt_xlate *xl, int numeric)
+{
+	const struct xt_tee_tginfo *info = (const void *)target->data;
+	
+	if (numeric)
+		xt_xlate_add(xl, "dup to %s",
+			     xtables_ip6addr_to_numeric(&info->gw.in6));
+	else
+		xt_xlate_add(xl, "dup to %s",
+			     xtables_ip6addr_to_anyname(&info->gw.in6));
+	if (*info->oif != '\0')
+		xt_xlate_add(xl, " oif %s", info->oif);
+
+	return 1;
+}
+
 static struct xtables_target tee_tg_reg[] = {
 	{
 		.name          = "TEE",
@@ -105,6 +140,7 @@ static struct xtables_target tee_tg_reg[] = {
 		.save          = tee_tg_save,
 		.x6_parse      = xtables_option_parse,
 		.x6_options    = tee_tg_opts,
+		.xlate         = tee_tg_xlate,
 	},
 	{
 		.name          = "TEE",
@@ -118,6 +154,7 @@ static struct xtables_target tee_tg_reg[] = {
 		.save          = tee_tg6_save,
 		.x6_parse      = xtables_option_parse,
 		.x6_options    = tee_tg_opts,
+		.xlate         = tee_tg6_xlate,
 	},
 };
 
-- 
2.7.4

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

             reply	other threads:[~2016-03-23 11:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-23 11:42 Roberto García [this message]
2016-03-28 10:31 ` [PATCH] iptables: extensions: libxt_TEE: Add translation to nft 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=1458733372-2543-1-git-send-email-rodanber@gmail.com \
    --to=rodanber@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 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.