libxtables: prefix/order - ascii to ipaddr/ipmask input

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c
index 42695bb453848f061cc5dcf132921599bed37e24..0d355a0dfe28fe2f422c56f4baab3eca8f20bdd0 100644 (file)
--- a/extensions/libipt_DNAT.c
+++ b/extensions/libipt_DNAT.c
@@ -117,13 +117,13 @@ parse_to(char *arg, int portok, struct ipt_natinfo *info)
        if (dash)
                *dash = '\0';
 
-       ip = numeric_to_ipaddr(arg);
+       ip = xtables_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 = numeric_to_ipaddr(dash+1);
+               ip = xtables_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 33f48c93798a86f31b31418f7c634d9e2600cbcd..f6c8bfdf3baf314ddbfcdbbb144719e536aec087 100644 (file)
--- a/extensions/libipt_NETMAP.c
+++ b/extensions/libipt_NETMAP.c
@@ -75,14 +75,14 @@ parse_to(char *arg, struct ip_nat_range *range)
        if (slash)
                *slash = '\0';
 
-       ip = numeric_to_ipaddr(arg);
+       ip = xtables_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 = numeric_to_ipmask(slash+1);
+                       ip = xtables_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 1ca38ff8fdc4cea01e794ffde926bfc144b4af18..6882242e8030ec216d50e3ea511c42afe2ea0394 100644 (file)
--- a/extensions/libipt_SAME.c
+++ b/extensions/libipt_SAME.c
@@ -56,14 +56,14 @@ parse_to(char *arg, struct ip_nat_range *range)
        if (dash)
                *dash = '\0';
 
-       ip = numeric_to_ipaddr(arg);
+       ip = xtables_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 = numeric_to_ipaddr(dash+1);
+               ip = xtables_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 2afcbb1ee58aa973d29077b7563286d87a602d44..0780aa1a1825e9a84810874ff9603697a71f8552 100644 (file)
--- a/extensions/libipt_SNAT.c
+++ b/extensions/libipt_SNAT.c
@@ -117,13 +117,13 @@ parse_to(char *arg, int portok, struct ipt_natinfo *info)
        if (dash)
                *dash = '\0';
 
-       ip = numeric_to_ipaddr(arg);
+       ip = xtables_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 = numeric_to_ipaddr(dash+1);
+               ip = xtables_numeric_to_ipaddr(dash+1);
                if (!ip)
                        exit_error(PARAMETER_PROBLEM, "Bad IP address `%s'\n",
                                   dash+1);

diff --git a/extensions/libxt_TPROXY.c b/extensions/libxt_TPROXY.c
index 2398c84943275f59ba9f4f0bce33b63ddc2d8506..54ae96d2f6a68f6cd40041ce34ab4291a0bceadc 100644 (file)
--- a/extensions/libxt_TPROXY.c
+++ b/extensions/libxt_TPROXY.c
@@ -50,7 +50,7 @@ static void parse_tproxy_laddr(const char *s, struct xt_tproxy_target_info *info
 {
        struct in_addr *laddr;
 
-       if ((laddr = numeric_to_ipaddr(s)) == NULL)
+       if ((laddr = xtables_numeric_to_ipaddr(s)) == NULL)
                xtables_param_act(XTF_BAD_VALUE, "TPROXY", "--on-ip", s);
 
        info->laddr = laddr->s_addr;

diff --git a/extensions/libxt_iprange.c b/extensions/libxt_iprange.c
index 9fdc70a6ffdaeeaf96f0c5786701cca6c1e02863..de079cbfdcab553525644755d5759c66f1291f54 100644 (file)
--- a/extensions/libxt_iprange.c
+++ b/extensions/libxt_iprange.c
@@ -40,14 +40,14 @@ parse_iprange(char *arg, struct ipt_iprange *range)
        if (dash != NULL)
                *dash = '\0';
 
-       ip = numeric_to_ipaddr(arg);
+       ip = xtables_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 != NULL) {
-               ip = numeric_to_ipaddr(dash+1);
+               ip = xtables_numeric_to_ipaddr(dash+1);
                if (!ip)
                        exit_error(PARAMETER_PROBLEM, "iprange match: Bad IP address `%s'\n",
                                   dash+1);
@@ -112,11 +112,11 @@ iprange_mt4_parse(int c, char **argv, int invert, unsigned int *flags,
                if (end == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--src-range", optarg);
                *end = '\0';
-               ia = numeric_to_ipaddr(optarg);
+               ia = xtables_numeric_to_ipaddr(optarg);
                if (ia == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--src-range", optarg);
                memcpy(&info->src_min.in, ia, sizeof(*ia));
-               ia = numeric_to_ipaddr(end+1);
+               ia = xtables_numeric_to_ipaddr(end+1);
                if (ia == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--src-range", end + 1);
                memcpy(&info->src_max.in, ia, sizeof(*ia));
@@ -131,11 +131,11 @@ iprange_mt4_parse(int c, char **argv, int invert, unsigned int *flags,
                if (end == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--dst-range", optarg);
                *end = '\0';
-               ia = numeric_to_ipaddr(optarg);
+               ia = xtables_numeric_to_ipaddr(optarg);
                if (ia == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--dst-range", optarg);
                memcpy(&info->dst_min.in, ia, sizeof(*ia));
-               ia = numeric_to_ipaddr(end + 1);
+               ia = xtables_numeric_to_ipaddr(end + 1);
                if (ia == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--dst-range", end + 1);
                memcpy(&info->dst_max.in, ia, sizeof(*ia));
@@ -162,11 +162,11 @@ iprange_mt6_parse(int c, char **argv, int invert, unsigned int *flags,
                if (end == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--src-range", optarg);
                *end = '\0';
-               ia = numeric_to_ip6addr(optarg);
+               ia = xtables_numeric_to_ip6addr(optarg);
                if (ia == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--src-range", optarg);
                memcpy(&info->src_min.in, ia, sizeof(*ia));
-               ia = numeric_to_ip6addr(end+1);
+               ia = xtables_numeric_to_ip6addr(end+1);
                if (ia == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--src-range", end + 1);
                memcpy(&info->src_max.in, ia, sizeof(*ia));
@@ -181,11 +181,11 @@ iprange_mt6_parse(int c, char **argv, int invert, unsigned int *flags,
                if (end == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--dst-range", optarg);
                *end = '\0';
-               ia = numeric_to_ip6addr(optarg);
+               ia = xtables_numeric_to_ip6addr(optarg);
                if (ia == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--dst-range", optarg);
                memcpy(&info->dst_min.in, ia, sizeof(*ia));
-               ia = numeric_to_ip6addr(end + 1);
+               ia = xtables_numeric_to_ip6addr(end + 1);
                if (ia == NULL)
                        xtables_param_act(XTF_BAD_VALUE, "iprange", "--dst-range", end + 1);
                memcpy(&info->dst_max.in, ia, sizeof(*ia));

diff --git a/include/xtables.h.in b/include/xtables.h.in
index 3099de8f97cd8dca75025e5e937b8922ac94bab1..936bbcc8fae12d8e015ddd990fbea6592791bc77 100644 (file)
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -210,12 +210,12 @@ extern void xtables_param_act(unsigned int, const char *, ...);
 extern const char *xtables_ipaddr_to_numeric(const struct in_addr *);
 extern const char *xtables_ipaddr_to_anyname(const struct in_addr *);
 extern const char *xtables_ipmask_to_numeric(const struct in_addr *);
-extern struct in_addr *numeric_to_ipaddr(const char *);
-extern struct in_addr *numeric_to_ipmask(const char *);
+extern struct in_addr *xtables_numeric_to_ipaddr(const char *);
+extern struct in_addr *xtables_numeric_to_ipmask(const char *);
 extern void ipparse_hostnetworkmask(const char *, struct in_addr **,
        struct in_addr *, unsigned int *);
 
-extern struct in6_addr *numeric_to_ip6addr(const char *);
+extern struct in6_addr *xtables_numeric_to_ip6addr(const char *);
 extern const char *xtables_ip6addr_to_numeric(const struct in6_addr *);
 extern const char *xtables_ip6addr_to_anyname(const struct in6_addr *);
 extern const char *xtables_ip6mask_to_numeric(const struct in6_addr *);

diff --git a/xtables.c b/xtables.c
index 07275f6e6cf374edb63bb4c134601d1b8149dc5f..859a82a513dcad5ff9fb209dd4065c66da92d889 100644 (file)
--- a/xtables.c
+++ b/xtables.c
@@ -860,12 +860,12 @@ static struct in_addr *__numeric_to_ipaddr(const char *dotted, bool is_mask)
        return &addr;
 }
 
-struct in_addr *numeric_to_ipaddr(const char *dotted)
+struct in_addr *xtables_numeric_to_ipaddr(const char *dotted)
 {
        return __numeric_to_ipaddr(dotted, false);
 }
 
-struct in_addr *numeric_to_ipmask(const char *dotted)
+struct in_addr *xtables_numeric_to_ipmask(const char *dotted)
 {
        return __numeric_to_ipaddr(dotted, true);
 }
@@ -914,7 +914,7 @@ ipparse_hostnetwork(const char *name, unsigned int *naddrs)
 {
        struct in_addr *addrptmp, *addrp;
 
-       if ((addrptmp = numeric_to_ipaddr(name)) != NULL ||
+       if ((addrptmp = xtables_numeric_to_ipaddr(name)) != NULL ||
            (addrptmp = network_to_ipaddr(name)) != NULL) {
                addrp = xtables_malloc(sizeof(struct in_addr));
                memcpy(addrp, addrptmp, sizeof(*addrp));
@@ -938,7 +938,7 @@ static struct in_addr *parse_ipmask(const char *mask)
                maskaddr.s_addr = 0xFFFFFFFF;
                return &maskaddr;
        }
-       if ((addrp = numeric_to_ipmask(mask)) != NULL)
+       if ((addrp = xtables_numeric_to_ipmask(mask)) != NULL)
                /* dotted_to_addr already returns a network byte order addr */
                return addrp;
        if (!xtables_strtoui(mask, NULL, &bits, 0, 32))
@@ -1068,7 +1068,7 @@ const char *xtables_ip6mask_to_numeric(const struct in6_addr *addrp)
        return buf;
 }
 
-struct in6_addr *numeric_to_ip6addr(const char *num)
+struct in6_addr *xtables_numeric_to_ip6addr(const char *num)
 {
        static struct in6_addr ap;
        int err;
@@ -1136,7 +1136,7 @@ ip6parse_hostnetwork(const char *name, unsigned int *naddrs)
 {
        struct in6_addr *addrp, *addrptmp;
 
-       if ((addrptmp = numeric_to_ip6addr(name)) != NULL ||
+       if ((addrptmp = xtables_numeric_to_ip6addr(name)) != NULL ||
            (addrptmp = network_to_ip6addr(name)) != NULL) {
                addrp = xtables_malloc(sizeof(struct in6_addr));
                memcpy(addrp, addrptmp, sizeof(*addrp));
@@ -1160,7 +1160,7 @@ static struct in6_addr *parse_ip6mask(char *mask)
                memset(&maskaddr, 0xff, sizeof maskaddr);
                return &maskaddr;
        }
-       if ((addrp = numeric_to_ip6addr(mask)) != NULL)
+       if ((addrp = xtables_numeric_to_ip6addr(mask)) != NULL)
                return addrp;
        if (!xtables_strtoui(mask, NULL, &bits, 0, 128))
                exit_error(PARAMETER_PROBLEM,