netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCHv2] extensions: libip6t_REJECT: Avoid to print the default reject with value in the translation
@ 2016-03-16 22:17 Laura Garcia Liebana
  2016-03-17 15:46 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: Laura Garcia Liebana @ 2016-03-16 22:17 UTC (permalink / raw)
  To: netfilter-devel; +Cc: shivanib134, pablo, outreachy-kernel

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

Signed-off-by: Laura Garcia Liebana <nevola@gmail.com>
---
v2:
	- Remove default constant, as Pablo suggested.

 extensions/libip6t_REJECT.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c
index c30f292..5fa551e 100644
--- a/extensions/libip6t_REJECT.c
+++ b/extensions/libip6t_REJECT.c
@@ -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",
-- 
2.7.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCHv2] extensions: libip6t_REJECT: Avoid to print the default reject with value in the translation
  2016-03-16 22:17 [PATCHv2] extensions: libip6t_REJECT: Avoid to print the default reject with value in the translation Laura Garcia Liebana
@ 2016-03-17 15:46 ` Pablo Neira Ayuso
  0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2016-03-17 15:46 UTC (permalink / raw)
  To: Laura Garcia Liebana; +Cc: netfilter-devel, shivanib134, outreachy-kernel

On Wed, Mar 16, 2016 at 11:17:52PM +0100, Laura Garcia Liebana wrote:
> 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

Also applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-03-17 15:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-16 22:17 [PATCHv2] extensions: libip6t_REJECT: Avoid to print the default reject with value in the translation Laura Garcia Liebana
2016-03-17 15:46 ` Pablo Neira Ayuso

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).