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>
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c
index a4f9e12..2a205e4 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 @@
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);
}
}