From f3479e41a8a8dfa59d8381b43c5cd2f655b025aa Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net" Date: Sun, 20 Jan 2008 13:36:08 +0000 Subject: [PATCH]: 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 --- extensions/libipt_DNAT.c | 4 ++-- extensions/libipt_NETMAP.c | 4 ++-- extensions/libipt_SAME.c | 8 ++++---- extensions/libipt_SNAT.c | 4 ++-- extensions/libipt_policy.c | 8 ++++---- extensions/libxt_conntrack.c | 7 ++++--- 6 files changed, 18 insertions(+), 17 deletions(-) (limited to 'extensions') diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c index 7322a20..8fb9238 100644 --- a/extensions/libipt_DNAT.c +++ b/extensions/libipt_DNAT.c @@ -198,10 +198,10 @@ static void print_range(const struct ip_nat_range *r) struct in_addr a; a.s_addr = r->min_ip; - printf("%s", addr_to_dotted(&a)); + printf("%s", ipaddr_to_numeric(&a)); if (r->max_ip != r->min_ip) { a.s_addr = r->max_ip; - printf("-%s", addr_to_dotted(&a)); + printf("-%s", ipaddr_to_numeric(&a)); } } if (r->flags & IP_NAT_RANGE_PROTO_SPECIFIED) { diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c index 558d557..6eb1688 100644 --- a/extensions/libipt_NETMAP.c +++ b/extensions/libipt_NETMAP.c @@ -154,11 +154,11 @@ static void NETMAP_print(const void *ip, const struct xt_entry_target *target, int bits; a.s_addr = r->min_ip; - printf("%s", addr_to_dotted(&a)); + printf("%s", ipaddr_to_numeric(&a)); a.s_addr = ~(r->min_ip ^ r->max_ip); bits = netmask2bits(a.s_addr); if (bits < 0) - printf("/%s", addr_to_dotted(&a)); + printf("/%s", ipaddr_to_numeric(&a)); else printf("/%d", bits); } diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c index de97466..43574bb 100644 --- a/extensions/libipt_SAME.c +++ b/extensions/libipt_SAME.c @@ -159,13 +159,13 @@ static void SAME_print(const void *ip, const struct xt_entry_target *target, a.s_addr = r->min_ip; - printf("%s", addr_to_dotted(&a)); + printf("%s", ipaddr_to_numeric(&a)); a.s_addr = r->max_ip; if (r->min_ip == r->max_ip) printf(" "); else - printf("-%s ", addr_to_dotted(&a)); + printf("-%s ", ipaddr_to_numeric(&a)); if (r->flags & IP_NAT_RANGE_PROTO_RANDOM) random = 1; } @@ -190,13 +190,13 @@ static void SAME_save(const void *ip, const struct xt_entry_target *target) struct in_addr a; a.s_addr = r->min_ip; - printf("--to %s", addr_to_dotted(&a)); + printf("--to %s", ipaddr_to_numeric(&a)); a.s_addr = r->max_ip; if (r->min_ip == r->max_ip) printf(" "); else - printf("-%s ", addr_to_dotted(&a)); + printf("-%s ", ipaddr_to_numeric(&a)); if (r->flags & IP_NAT_RANGE_PROTO_RANDOM) random = 1; } diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c index 9e0a1f3..b69c649 100644 --- a/extensions/libipt_SNAT.c +++ b/extensions/libipt_SNAT.c @@ -199,10 +199,10 @@ static void print_range(const struct ip_nat_range *r) struct in_addr a; a.s_addr = r->min_ip; - printf("%s", addr_to_dotted(&a)); + printf("%s", ipaddr_to_numeric(&a)); if (r->max_ip != r->min_ip) { a.s_addr = r->max_ip; - printf("-%s", addr_to_dotted(&a)); + printf("-%s", ipaddr_to_numeric(&a)); } } if (r->flags & IP_NAT_RANGE_PROTO_SPECIFIED) { diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c index 16797bf..928de62 100644 --- a/extensions/libipt_policy.c +++ b/extensions/libipt_policy.c @@ -353,14 +353,14 @@ static void print_entry(char *prefix, const struct ipt_policy_elem *e, if (e->match.daddr) { PRINT_INVERT(e->invert.daddr); printf("%stunnel-dst %s%s ", prefix, - addr_to_dotted((struct in_addr *)&e->daddr), - mask_to_dotted((struct in_addr *)&e->dmask)); + ipaddr_to_numeric((const void *)&e->daddr), + ipmask_to_numeric((const void *)&e->dmask)); } if (e->match.saddr) { PRINT_INVERT(e->invert.saddr); printf("%stunnel-src %s%s ", prefix, - addr_to_dotted((struct in_addr *)&e->saddr), - mask_to_dotted((struct in_addr *)&e->smask)); + ipaddr_to_numeric((const void *)&e->saddr), + ipmask_to_numeric((const void *)&e->smask)); } } 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 #include #include +#include #include #include #include @@ -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); } } -- cgit v1.2.3