Skip to contentSkip to conversation

extensions: libip6t_REJECT: Avoid to print the default reject with value in the translation

PATCH Superseded Laura Garcia Liebana 2 participants 2 messages Mar 16, 2016 – Mar 17, 2016 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 extensions: libip6t_REJECT: Avoid to print the default reject with value in the translation

Avoid to print the reject with value in the translation when the value is the default.

Before this patch:

$ sudo ip6tables-translate -A FORWARD -p TCP --dport 22 -j REJECT
nft add rule ip6 filter FORWARD tcp dport 22 counter reject with icmpv6 type port-unreachable

After this patch:

$ sudo ip6tables-translate -A FORWARD -p TCP --dport 22 -j REJECT
nft add rule ip6 filter FORWARD tcp dport 22 counter reject

---
v2:
- Remove default constant, as Pablo suggested.

 extensions/libip6t_REJECT.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
extensions/libip6t_REJECT.c +4 -1
index c30f292..5fa551e 100644
@@ -149,7 +149,10 @@ static int REJECT_xlate(const void *ip, const struct xt_entry_target *target,
 	for (i = 0; i < ARRAY_SIZE(reject_table_xlate); ++i)
 		if (reject_table_xlate[i].with == reject->with)
 			break;
-	if (reject->with == IP6T_TCP_RESET)
+
+	if (reject->with == IP6T_ICMP6_PORT_UNREACH)
+		xt_xlate_add(xl, "reject");
+	else if (reject->with == IP6T_TCP_RESET)
 		xt_xlate_add(xl, "reject with %s", reject_table_xlate[i].name);
 	else
 		xt_xlate_add(xl, "reject with icmpv6 type %s",
Signature · 1 line
2.7.0
#1 lore raw
Quoted 5 lines · Laura Garcia Liebana

Avoid to print the reject with value in the translation when the value is the default.

Before this patch:

Quoted 7 lines
$ sudo ip6tables-translate -A FORWARD -p TCP --dport 22 -j REJECT
nft add rule ip6 filter FORWARD tcp dport 22 counter reject with icmpv6 type port-unreachable

After this patch:

$ sudo ip6tables-translate -A FORWARD -p TCP --dport 22 -j REJECT
nft add rule ip6 filter FORWARD tcp dport 22 counter reject

Also applied, thanks.