summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2010-06-24 21:23:44 +0200
committerJan Engelhardt <jengelh@medozas.de>2010-06-24 21:23:44 +0200
commit76f7a230e4182ab2b64a68c9d84437035d925f3b (patch)
tree38c88137438a0e866aa2de92ce27103104f50dbb
parentdd2bbe0b614ad60fb2e267863471836aae424425 (diff)
libxt_conntrack: do print netmask
References: http://bugzilla.netfilter.org/show_bug.cgi?id=659 Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
-rw-r--r--extensions/libxt_conntrack.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
index e8225e6d..5557d3ea 100644
--- 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));
}
}