Skip to contentSkip to conversation

extensions: libipt_icmp: Add translation to nft

PATCH Superseded Laura Garcia Liebana 3 participants 4 messages Mar 5, 2016 – Mar 7, 2016 netfilter

v1 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 extensions: libipt_icmp: Add translation to nft

Add translation for icmp to nftables.

Examples:

$ sudo iptables-translate -t filter -A INPUT -m icmp --icmp-type any -j LOG
nft add rule ip filter INPUT icmp type any counter log level warn
$ sudo iptables-translate -t filter -A INPUT -m icmp --icmp-type 3/1 -j LOG
nft add rule ip filter INPUT icmp type host-unreachable counter log level warn
$ sudo iptables-translate -t filter -A INPUT -m icmp ! --icmp-type 3 -j LOG
nft add rule ip filter INPUT icmp type != destination-unreachable counter log level warn
---
 extensions/libipt_icmp.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)
extensions/libipt_icmp.c +32 -1
index 666e7da..795172f 100644
@@ -218,7 +218,7 @@ static void print_icmptype(uint8_t type,
 }
 
 static void icmp_print(const void *ip, const struct xt_entry_match *match,
-                       int numeric)
+		       int numeric)
 {
 	const struct ipt_icmp *icmp = (struct ipt_icmp *)match->data;
 
@@ -249,6 +249,36 @@ static void icmp_save(const void *ip, const struct xt_entry_match *match)
 	}
 }
 
+static void type_xlate_print(struct xt_xlate *xl, unsigned int icmptype,
+			     unsigned int code_min, unsigned int code_max)
+{
+	unsigned int i;
+
+	for (i = 0; ARRAY_SIZE(icmp_codes); i++)
+		if (icmp_codes[i].type == icmptype &&
+		    icmp_codes[i].code_min == code_min &&
+		    icmp_codes[i].code_max == code_max)
+			break;
+
+	xt_xlate_add(xl, icmp_codes[i].name);
+}
+
+static int icmp_xlate(const struct xt_entry_match *match, struct xt_xlate *xl,
+		       int numeric)
+{
+	const struct ipt_icmp *info = (struct ipt_icmp *)match->data;
+
+	xt_xlate_add(xl, "icmp type%s ",
+		     (info->invflags & IPT_ICMP_INV) ? " !=" : "");
+
+	type_xlate_print(xl, info->type, info->code[0], info->code[1]);
+
+	xt_xlate_add(xl, " ");
+
+	return 1;
+}
+
+
 static struct xtables_match icmp_mt_reg = {
 	.name		= "icmp",
 	.version	= XTABLES_VERSION,
@@ -261,6 +291,7 @@ static struct xtables_match icmp_mt_reg = {
 	.save		= icmp_save,
 	.x6_parse	= icmp_parse,
 	.x6_options	= icmp_opts,
+	.xlate		= icmp_xlate,
 };
 
 void _init(void)
Signature · 1 line
2.7.0
#1 lore raw
Quoted 4 lines · Laura Garcia Liebana

Add translation for icmp to nftables.

Examples:

Quoted 9 lines
$ sudo iptables-translate -t filter -A INPUT -m icmp --icmp-type any -j LOG
nft add rule ip filter INPUT icmp type any counter log level warn
$ sudo iptables-translate -t filter -A INPUT -m icmp --icmp-type 3/1 -j LOG
nft add rule ip filter INPUT icmp type host-unreachable counter log level warn
$ sudo iptables-translate -t filter -A INPUT -m icmp ! --icmp-type 3 -j LOG
nft add rule ip filter INPUT icmp type != destination-unreachable counter log level warn

Hi Laura,

There are some icmp types that nftables does not support, have you tried adding up rules corresponding to all the packet types?

$ sudo nft add table filter
$ sudo nft add chain filter INPUT { type filter hook input priority 0\;}
$ sudo <your generated rule goes here>

Please consider finding out such packet types and mention about them in commit message.
Same for icmpv6.

Quoted 19 lines
---
 extensions/libipt_icmp.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)
extensions/libipt_icmp.c +1 -1
index 666e7da..795172f 100644
@@ -218,7 +218,7 @@ static void print_icmptype(uint8_t type,
 }
 
 static void icmp_print(const void *ip, const struct xt_entry_match *match,
-                       int numeric)
+                      int numeric)
 {
        const struct ipt_icmp *icmp = (struct ipt_icmp *)match->data;
 

extensions/libipt_icmp.c static void icmp_save(const void *ip, const struct xt_entry_match *match) · line 257

Quoted 9 lines
extensions/libipt_icmp.c +6 -0
@@ -249,6 +249,36 @@ static void icmp_save(const void *ip, const struct xt_entry_match *match)
        }
 }
 
+static void type_xlate_print(struct xt_xlate *xl, unsigned int icmptype,
+                            unsigned int code_min, unsigned int code_max)
+{
+       unsigned int i;
+
+       for (i = 0; ARRAY_SIZE(icmp_codes); i++)

Also, here you are using the array icmp_codes, this will give out the same packet names as iptables. But, some packet names are different in nftables. May be not in case of icmp but in case of icmp6. Please have a look at this.

Thanks.

Quoted 38 lines
extensions/libipt_icmp.c +25 -1
+               if (icmp_codes[i].type == icmptype &&
+                   icmp_codes[i].code_min == code_min &&
+                   icmp_codes[i].code_max == code_max)
+                       break;
+
+       xt_xlate_add(xl, icmp_codes[i].name);
+}
+
+static int icmp_xlate(const struct xt_entry_match *match, struct xt_xlate *xl,
+                      int numeric)
+{
+       const struct ipt_icmp *info = (struct ipt_icmp *)match->data;
+
+       xt_xlate_add(xl, "icmp type%s ",
+                    (info->invflags & IPT_ICMP_INV) ? " !=" : "");
+
+       type_xlate_print(xl, info->type, info->code[0], info->code[1]);
+
+       xt_xlate_add(xl, " ");
+
+       return 1;
+}
+
+
 static struct xtables_match icmp_mt_reg = {
        .name           = "icmp",
        .version        = XTABLES_VERSION,
@@ -261,6 +291,7 @@ static struct xtables_match icmp_mt_reg = {
        .save           = icmp_save,
        .x6_parse       = icmp_parse,
        .x6_options     = icmp_opts,
+       .xlate          = icmp_xlate,
 };
 
 void _init(void)
--

2.7.0

#2 lore raw
Quoted 1 line · Shivani Bhardwaj

There are some icmp types that nftables does not support, have you

And these types (and subtypes) are not supported yet or will never be supported?

Quoted 2 lines

tried adding up rules corresponding to all the packet types?

Yes, but not all of them.

Quoted 6 lines
$ sudo nft add table filter
$ sudo nft add chain filter INPUT { type filter hook input priority 0\;}
$ sudo <your generated rule goes here>

Please consider finding out such packet types and mention about them in commit message.

Ok.

Quoted 5 lines

Also, here you are using the array icmp_codes, this will give out the same packet names as iptables. But, some packet names are different in nftables. May be not in case of icmp but in case of icmp6. Please have a look at this.

Ok, as there isn't a direct translation I'll provide a v2 with a list of supported types.

Thanks!

#3 lore raw
In reply to Laura Garcia Liebana
Quoted 53 lines · Laura Garcia Liebana

Add translation for icmp to nftables.

Examples:

$ sudo iptables-translate -t filter -A INPUT -m icmp --icmp-type any -j LOG
nft add rule ip filter INPUT icmp type any counter log level warn
$ sudo iptables-translate -t filter -A INPUT -m icmp --icmp-type 3/1 -j LOG
nft add rule ip filter INPUT icmp type host-unreachable counter log level warn
$ sudo iptables-translate -t filter -A INPUT -m icmp ! --icmp-type 3 -j LOG
nft add rule ip filter INPUT icmp type != destination-unreachable counter log level warn
---
 extensions/libipt_icmp.c | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)
extensions/libipt_icmp.c +19 -1
index 666e7da..795172f 100644
@@ -218,7 +218,7 @@ static void print_icmptype(uint8_t type,
 }
 
 static void icmp_print(const void *ip, const struct xt_entry_match *match,
-                       int numeric)
+		       int numeric)
 {
 	const struct ipt_icmp *icmp = (struct ipt_icmp *)match->data;
 
@@ -249,6 +249,36 @@ static void icmp_save(const void *ip, const struct xt_entry_match *match)
 	}
 }
 
+static void type_xlate_print(struct xt_xlate *xl, unsigned int icmptype,
+			     unsigned int code_min, unsigned int code_max)
+{
+	unsigned int i;
+
+	for (i = 0; ARRAY_SIZE(icmp_codes); i++)
+		if (icmp_codes[i].type == icmptype &&
+		    icmp_codes[i].code_min == code_min &&
+		    icmp_codes[i].code_max == code_max)
+			break;
+
+	xt_xlate_add(xl, icmp_codes[i].name);
+}
+
+static int icmp_xlate(const struct xt_entry_match *match, struct xt_xlate *xl,
+		       int numeric)
+{
+	const struct ipt_icmp *info = (struct ipt_icmp *)match->data;

extensions/libipt_icmp.c static void icmp_save(const void *ip, const struct xt_entry_match *match) · line 279

Quoted 10 lines
extensions/libipt_icmp.c +10 -0
+
+	xt_xlate_add(xl, "icmp type%s ",
+		     (info->invflags & IPT_ICMP_INV) ? " !=" : "");
+
+	type_xlate_print(xl, info->type, info->code[0], info->code[1]);
+
+	xt_xlate_add(xl, " ");
+
+	return 1;
+}

icmpv6 codes matching can be translated to:

icmpv6 code VALUE

I know this is still broken in nft when listing, but I have initial a couple of patches to fix this here almost done.

So please provide the translation for this too, this will work soon.