libxt_conntrack: do print netmask

References: http://bugzilla.netfilter.org/show_bug.cgi?id=659
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
index e8225e6df4a249a0b6d983ab74ac8cf2cb2bc74e..5557d3ea822364728be8af6de9004ea8d6b27f5c 100644 (file)
--- a/extensions/libxt_conntrack.c
+++ b/extensions/libxt_conntrack.c
@@ -842,9 +842,13 @@ conntrack_dump_addr(const union nf_inet_addr *addr,
                        return;
                }
                if (numeric)
-                       printf("%s ", xtables_ipaddr_to_numeric(&addr->in));
+                       printf("%s%s ",
+                              xtables_ipaddr_to_numeric(&addr->in),
+                              xtables_ipmask_to_numeric(&mask->in));
                else
-                       printf("%s ", xtables_ipaddr_to_anyname(&addr->in));
+                       printf("%s%s ",
+                              xtables_ipaddr_to_anyname(&addr->in),
+                              xtables_ipmask_to_numeric(&mask->in));
        } else if (family == NFPROTO_IPV6) {
                if (!numeric && addr->ip6[0] == 0 && addr->ip6[1] == 0 &&
                    addr->ip6[2] == 0 && addr->ip6[3] == 0) {
@@ -852,9 +856,13 @@ conntrack_dump_addr(const union nf_inet_addr *addr,
                        return;
                }
                if (numeric)
-                       printf("%s ", xtables_ip6addr_to_numeric(&addr->in6));
+                       printf("%s%s ",
+                              xtables_ip6addr_to_numeric(&addr->in6),
+                              xtables_ip6mask_to_numeric(&mask->in6));
                else
-                       printf("%s ", xtables_ip6addr_to_anyname(&addr->in6));
+                       printf("%s%s ",
+                              xtables_ip6addr_to_anyname(&addr->in6),
+                              xtables_ip6mask_to_numeric(&mask->in6));
        }
 }