diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2008-01-20 13:36:08 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2008-01-20 13:36:08 +0000 |
| commit | 08b1616e068166e016b3ee7110db10ae5d853422 (patch) | |
| tree | 488c6f587304c43ca94e6c0da62cf4547fcac564 /extensions/libxt_conntrack.c | |
| parent | a80b6046fa216c26dbc18d587f6255afa8444885 (diff) | |
bunch o' renames
Move a few functions from iptables.c/ip6tables.c to xtables.c
so they are available for combined (both AF_INET and AF_INET6)
libxt modules. Rename overlapping function names.
Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Diffstat (limited to 'extensions/libxt_conntrack.c')
| -rw-r--r-- | extensions/libxt_conntrack.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c index a4f9e124..2a205e40 100644 --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c @@ -9,6 +9,7 @@ #include <stdlib.h> #include <string.h> #include <iptables.h> +#include <xtables.h> #include <linux/netfilter.h> #include <linux/netfilter/xt_conntrack.h> #include <linux/netfilter/nf_conntrack_common.h> @@ -388,10 +389,10 @@ print_addr(struct in_addr *addr, struct in_addr *mask, int inv, int numeric) printf("%s ", "anywhere"); else { if (numeric) - sprintf(buf, "%s", addr_to_dotted(addr)); + sprintf(buf, "%s", ipaddr_to_numeric(addr)); else - sprintf(buf, "%s", addr_to_anyname(addr)); - strcat(buf, mask_to_dotted(mask)); + sprintf(buf, "%s", ipaddr_to_anyname(addr)); + strcat(buf, ipmask_to_numeric(mask)); printf("%s ", buf); } } |