From 2f9be9412597f21517560fb14dcccbeadc23ba37 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:38:08 +0000 Subject: [PATCH]: rename overlapping function names Rename overlapping function names. Signed-off-by: Jan Engelhardt --- extensions/libip6t_policy.c | 6 ++---- extensions/libipt_DNAT.c | 6 +++--- extensions/libipt_NETMAP.c | 6 +++--- extensions/libipt_SAME.c | 6 +++--- extensions/libipt_SNAT.c | 6 +++--- extensions/libipt_iprange.c | 6 +++--- extensions/libipt_policy.c | 4 ++-- extensions/libxt_conntrack.c | 8 ++++---- 8 files changed, 23 insertions(+), 25 deletions(-) (limited to 'extensions') diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c index bdd9836..1ecd66e 100644 --- a/extensions/libip6t_policy.c +++ b/extensions/libip6t_policy.c @@ -128,8 +128,6 @@ mask_to_numeric(const struct in6_addr *addrp) /* These should be in include/ip6tables.h... */ extern u_int16_t parse_protocol(const char *s); -extern void parse_hostnetworkmask(const char *name, struct in6_addr **addrpp, - struct in6_addr *maskp, unsigned int *naddrs); /* End duplicated code from ip6tables.c */ @@ -223,7 +221,7 @@ static int policy_parse(int c, char **argv, int invert, unsigned int *flags, exit_error(PARAMETER_PROBLEM, "policy match: double --tunnel-src option"); - parse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); + ip6parse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); if (naddr > 1) exit_error(PARAMETER_PROBLEM, "policy match: name resolves to multiple IPs"); @@ -238,7 +236,7 @@ static int policy_parse(int c, char **argv, int invert, unsigned int *flags, exit_error(PARAMETER_PROBLEM, "policy match: double --tunnel-dst option"); - parse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); + ip6parse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); if (naddr > 1) exit_error(PARAMETER_PROBLEM, "policy match: name resolves to multiple IPs"); diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c index 8fb9238..6999ee9 100644 --- a/extensions/libipt_DNAT.c +++ b/extensions/libipt_DNAT.c @@ -62,7 +62,7 @@ parse_to(char *arg, int portok, struct ipt_natinfo *info) { struct ip_nat_range range; char *colon, *dash, *error; - struct in_addr *ip; + const struct in_addr *ip; memset(&range, 0, sizeof(range)); colon = strchr(arg, ':'); @@ -119,13 +119,13 @@ parse_to(char *arg, int portok, struct ipt_natinfo *info) if (dash) *dash = '\0'; - ip = dotted_to_addr(arg); + ip = numeric_to_ipaddr(arg); if (!ip) exit_error(PARAMETER_PROBLEM, "Bad IP address `%s'\n", arg); range.min_ip = ip->s_addr; if (dash) { - ip = dotted_to_addr(dash+1); + ip = numeric_to_ipaddr(dash+1); if (!ip) exit_error(PARAMETER_PROBLEM, "Bad IP address `%s'\n", dash+1); diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c index 6eb1688..4073693 100644 --- a/extensions/libipt_NETMAP.c +++ b/extensions/libipt_NETMAP.c @@ -68,7 +68,7 @@ static void parse_to(char *arg, struct ip_nat_range *range) { char *slash; - struct in_addr *ip; + const struct in_addr *ip; u_int32_t netmask; unsigned int bits; @@ -77,14 +77,14 @@ parse_to(char *arg, struct ip_nat_range *range) if (slash) *slash = '\0'; - ip = dotted_to_addr(arg); + ip = numeric_to_ipaddr(arg); if (!ip) exit_error(PARAMETER_PROBLEM, "Bad IP address `%s'\n", arg); range->min_ip = ip->s_addr; if (slash) { if (strchr(slash+1, '.')) { - ip = dotted_to_mask(slash+1); + ip = numeric_to_ipmask(slash+1); if (!ip) exit_error(PARAMETER_PROBLEM, "Bad netmask `%s'\n", slash+1); diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c index 43574bb..6aaac99 100644 --- a/extensions/libipt_SAME.c +++ b/extensions/libipt_SAME.c @@ -52,7 +52,7 @@ static void parse_to(char *arg, struct ip_nat_range *range) { char *dash; - struct in_addr *ip; + const struct in_addr *ip; range->flags |= IP_NAT_RANGE_MAP_IPS; dash = strchr(arg, '-'); @@ -60,14 +60,14 @@ parse_to(char *arg, struct ip_nat_range *range) if (dash) *dash = '\0'; - ip = dotted_to_addr(arg); + ip = numeric_to_ipaddr(arg); if (!ip) exit_error(PARAMETER_PROBLEM, "Bad IP address `%s'\n", arg); range->min_ip = ip->s_addr; if (dash) { - ip = dotted_to_addr(dash+1); + ip = numeric_to_ipaddr(dash+1); if (!ip) exit_error(PARAMETER_PROBLEM, "Bad IP address `%s'\n", dash+1); diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c index b69c649..7eae53c 100644 --- a/extensions/libipt_SNAT.c +++ b/extensions/libipt_SNAT.c @@ -62,7 +62,7 @@ parse_to(char *arg, int portok, struct ipt_natinfo *info) { struct ip_nat_range range; char *colon, *dash, *error; - struct in_addr *ip; + const struct in_addr *ip; memset(&range, 0, sizeof(range)); colon = strchr(arg, ':'); @@ -119,13 +119,13 @@ parse_to(char *arg, int portok, struct ipt_natinfo *info) if (dash) *dash = '\0'; - ip = dotted_to_addr(arg); + ip = numeric_to_ipaddr(arg); if (!ip) exit_error(PARAMETER_PROBLEM, "Bad IP address `%s'\n", arg); range.min_ip = ip->s_addr; if (dash) { - ip = dotted_to_addr(dash+1); + ip = numeric_to_ipaddr(dash+1); if (!ip) exit_error(PARAMETER_PROBLEM, "Bad IP address `%s'\n", dash+1); diff --git a/extensions/libipt_iprange.c b/extensions/libipt_iprange.c index 05d6db9..f262bba 100644 --- a/extensions/libipt_iprange.c +++ b/extensions/libipt_iprange.c @@ -29,20 +29,20 @@ static void parse_iprange(char *arg, struct ipt_iprange *range) { char *dash; - struct in_addr *ip; + const struct in_addr *ip; dash = strchr(arg, '-'); if (dash) *dash = '\0'; - ip = dotted_to_addr(arg); + ip = numeric_to_ipaddr(arg); if (!ip) exit_error(PARAMETER_PROBLEM, "iprange match: Bad IP address `%s'\n", arg); range->min_ip = ip->s_addr; if (dash) { - ip = dotted_to_addr(dash+1); + ip = numeric_to_ipaddr(dash+1); if (!ip) exit_error(PARAMETER_PROBLEM, "iprange match: Bad IP address `%s'\n", dash+1); diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c index 928de62..a805e13 100644 --- a/extensions/libipt_policy.c +++ b/extensions/libipt_policy.c @@ -183,7 +183,7 @@ static int policy_parse(int c, char **argv, int invert, unsigned int *flags, exit_error(PARAMETER_PROBLEM, "policy match: double --tunnel-src option"); - parse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); + ipparse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); if (naddr > 1) exit_error(PARAMETER_PROBLEM, "policy match: name resolves to multiple IPs"); @@ -198,7 +198,7 @@ static int policy_parse(int c, char **argv, int invert, unsigned int *flags, exit_error(PARAMETER_PROBLEM, "policy match: double --tunnel-dst option"); - parse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); + ipparse_hostnetworkmask(argv[optind-1], &addr, &mask, &naddr); if (naddr > 1) exit_error(PARAMETER_PROBLEM, "policy match: name resolves to multiple IPs"); diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c index 2a205e4..9c7b01a 100644 --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c @@ -203,7 +203,7 @@ static int conntrack_parse(int c, char **argv, int invert, unsigned int *flags, if (invert) sinfo->invflags |= XT_CONNTRACK_ORIGSRC; - parse_hostnetworkmask(argv[optind-1], &addrs, + ipparse_hostnetworkmask(argv[optind-1], &addrs, &sinfo->sipmsk[IP_CT_DIR_ORIGINAL], &naddrs); if(naddrs > 1) @@ -223,7 +223,7 @@ static int conntrack_parse(int c, char **argv, int invert, unsigned int *flags, if (invert) sinfo->invflags |= XT_CONNTRACK_ORIGDST; - parse_hostnetworkmask(argv[optind-1], &addrs, + ipparse_hostnetworkmask(argv[optind-1], &addrs, &sinfo->dipmsk[IP_CT_DIR_ORIGINAL], &naddrs); if(naddrs > 1) @@ -243,7 +243,7 @@ static int conntrack_parse(int c, char **argv, int invert, unsigned int *flags, if (invert) sinfo->invflags |= XT_CONNTRACK_REPLSRC; - parse_hostnetworkmask(argv[optind-1], &addrs, + ipparse_hostnetworkmask(argv[optind-1], &addrs, &sinfo->sipmsk[IP_CT_DIR_REPLY], &naddrs); if(naddrs > 1) @@ -263,7 +263,7 @@ static int conntrack_parse(int c, char **argv, int invert, unsigned int *flags, if (invert) sinfo->invflags |= XT_CONNTRACK_REPLDST; - parse_hostnetworkmask(argv[optind-1], &addrs, + ipparse_hostnetworkmask(argv[optind-1], &addrs, &sinfo->dipmsk[IP_CT_DIR_REPLY], &naddrs); if(naddrs > 1) -- cgit v1.2.3