]> git.ipfire.org Git - thirdparty/iptables.git/commitdiff
libxt_conntrack: respect -n option during ruledump
authorJan Engelhardt <jengelh@medozas.de>
Mon, 10 Nov 2008 16:08:07 +0000 (17:08 +0100)
committerPatrick McHardy <kaber@trash.net>
Mon, 10 Nov 2008 16:08:07 +0000 (17:08 +0100)
Reference: http://bugs.debian.org/502548

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
extensions/libxt_conntrack.c

index 79ed3b8aadfbabf38b5d4bce983e0ff38ae2ad61..987e1af4397bdbfda8d99206fab1f37299066127 100644 (file)
@@ -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));
        }
 }