diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2009-01-30 03:55:09 +0100 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2009-01-30 03:55:09 +0100 |
commit | e44ea7faa17c10c68f14f5338a7cc6e3291a0ce7 (patch) | |
tree | 4240b28def0ad4f7f2e2cdcae935636d26ac8ea7 /extensions/libxt_conntrack.c | |
parent | a41545ca7cde43e0ba53260ba74bd9bf74025a68 (diff) |
libxtables: prefix/order - ipaddr/ipmask to ascii output
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'extensions/libxt_conntrack.c')
-rw-r--r-- | extensions/libxt_conntrack.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c index facd0fc2..ffa279ca 100644 --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c @@ -761,9 +761,9 @@ conntrack_dump_addr(const union nf_inet_addr *addr, return; } if (numeric) - printf("%s ", ipaddr_to_numeric(&addr->in)); + printf("%s ", xtables_ipaddr_to_numeric(&addr->in)); else - printf("%s ", ipaddr_to_anyname(&addr->in)); + printf("%s ", xtables_ipaddr_to_anyname(&addr->in)); } else if (family == NFPROTO_IPV6) { if (!numeric && addr->ip6[0] == 0 && addr->ip6[1] == 0 && addr->ip6[2] == 0 && addr->ip6[3] == 0) { @@ -771,9 +771,9 @@ conntrack_dump_addr(const union nf_inet_addr *addr, return; } if (numeric) - printf("%s ", ip6addr_to_numeric(&addr->in6)); + printf("%s ", xtables_ip6addr_to_numeric(&addr->in6)); else - printf("%s ", ip6addr_to_anyname(&addr->in6)); + printf("%s ", xtables_ip6addr_to_anyname(&addr->in6)); } } @@ -789,10 +789,10 @@ print_addr(struct in_addr *addr, struct in_addr *mask, int inv, int numeric) printf("%s ", "anywhere"); else { if (numeric) - sprintf(buf, "%s", ipaddr_to_numeric(addr)); + strcpy(buf, xtables_ipaddr_to_numeric(addr)); else - sprintf(buf, "%s", ipaddr_to_anyname(addr)); - strcat(buf, ipmask_to_numeric(mask)); + strcpy(buf, xtables_ipaddr_to_anyname(addr)); + strcat(buf, xtables_ipmask_to_numeric(mask)); printf("%s ", buf); } } |