All of lore.kernel.org
 help / color / mirror / Atom feed
* libxt_conntrack: respect -n option during ruledump
@ 2008-11-07  3:12 Jan Engelhardt
  2008-11-10 16:08 ` Patrick McHardy
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Engelhardt @ 2008-11-07  3:12 UTC (permalink / raw)
  To: kaber; +Cc: Netfilter Developer Mailing List

commit a25e1ace7aac161fe8f61882b10dfb65551f8239
Author: Bernhard Miklautz <miklautz@inqnet.at>
Date:   Fri Oct 17 18:49:53 2008 +0200

libxt_conntrack: respect -n option during ruledump

Reference: http://bugs.debian.org/502548

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 extensions/libxt_conntrack.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
index 79ed3b8..987e1af 100644
--- a/extensions/libxt_conntrack.c
+++ b/extensions/libxt_conntrack.c
@@ -758,14 +758,20 @@ conntrack_dump_addr(const union nf_inet_addr *addr,
 			printf("anywhere ");
 			return;
 		}
-		printf("%s ", ipaddr_to_anyname(&addr->in));
+		if (numeric)
+			printf("%s ", ipaddr_to_numeric(&addr->in));
+		else
+			printf("%s ", ipaddr_to_anyname(&addr->in));
 	} else if (family == AF_INET6) {
 		if (!numeric && addr->ip6[0] == 0 && addr->ip6[1] == 0 &&
 		    addr->ip6[2] == 0 && addr->ip6[3] == 0) {
 			printf("anywhere ");
 			return;
 		}
-		printf("%s ", ip6addr_to_anyname(&addr->in6));
+		if (numeric)
+			printf("%s ", ip6addr_to_numeric(&addr->in6));
+		else
+			printf("%s ", ip6addr_to_anyname(&addr->in6));
 	}
 }
 


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

* Re: libxt_conntrack: respect -n option during ruledump
  2008-11-07  3:12 libxt_conntrack: respect -n option during ruledump Jan Engelhardt
@ 2008-11-10 16:08 ` Patrick McHardy
  0 siblings, 0 replies; 2+ messages in thread
From: Patrick McHardy @ 2008-11-10 16:08 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: Netfilter Developer Mailing List

Jan Engelhardt wrote:
> commit a25e1ace7aac161fe8f61882b10dfb65551f8239
> Author: Bernhard Miklautz <miklautz@inqnet.at>
> Date:   Fri Oct 17 18:49:53 2008 +0200
> 
> libxt_conntrack: respect -n option during ruledump
> 
> Reference: http://bugs.debian.org/50254

Applied, thanks.



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

end of thread, other threads:[~2008-11-10 16:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-11-07  3:12 libxt_conntrack: respect -n option during ruledump Jan Engelhardt
2008-11-10 16:08 ` Patrick McHardy

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.