libxtables: prefix - misc functions

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

diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c
index 64ab737b6d7a5a81ee805cb8eed8027d20989410..1ef2b2ece17a43e43a83a574fc9340e8fa4f57e9 100644 (file)
--- a/extensions/libipt_REDIRECT.c
+++ b/extensions/libipt_REDIRECT.c
@@ -48,7 +48,7 @@ parse_ports(const char *arg, struct ip_nat_multi_range *mr)
 
        port = atoi(arg);
        if (port == 0)
-               port = service_to_port(arg, NULL);
+               port = xtables_service_to_port(arg, NULL);
 
        if (port == 0 || port > 65535)
                exit_error(PARAMETER_PROBLEM, "Port `%s' not valid\n", arg);

diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c
index b7b55e27f601b9d14125e4d4b7a5fde4c4418ca5..9be065829156c1aadc34abbbc68d227aa633f802 100644 (file)
--- a/extensions/libxt_dccp.c
+++ b/extensions/libxt_dccp.c
@@ -62,14 +62,14 @@ parse_dccp_ports(const char *portstring,
        buffer = strdup(portstring);
        DEBUGP("%s\n", portstring);
        if ((cp = strchr(buffer, ':')) == NULL) {
-               ports[0] = ports[1] = parse_port(buffer, "dccp");
+               ports[0] = ports[1] = xtables_parse_port(buffer, "dccp");
        }
        else {
                *cp = '\0';
                cp++;
 
-               ports[0] = buffer[0] ? parse_port(buffer, "dccp") : 0;
-               ports[1] = cp[0] ? parse_port(cp, "dccp") : 0xFFFF;
+               ports[0] = buffer[0] ? xtables_parse_port(buffer, "dccp") : 0;
+               ports[1] = cp[0] ? xtables_parse_port(cp, "dccp") : 0xFFFF;
 
                if (ports[0] > ports[1])
                        exit_error(PARAMETER_PROBLEM,

diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c
index dae6e3350a1d19a16df6739d875970b7a9b054d0..a7db2a8329b23cdef2f31e40d11d98962929f2c0 100644 (file)
--- a/extensions/libxt_multiport.c
+++ b/extensions/libxt_multiport.c
@@ -81,7 +81,7 @@ parse_multi_ports(const char *portstring, u_int16_t *ports, const char *proto)
        {
                next=strchr(cp, ',');
                if (next) *next++='\0';
-               ports[i] = parse_port(cp, proto);
+               ports[i] = xtables_parse_port(cp, proto);
        }
        if (cp) exit_error(PARAMETER_PROBLEM, "too many ports specified");
        free(buffer);
@@ -113,10 +113,10 @@ parse_multi_ports_v1(const char *portstring,
                                           "too many ports specified");
                        *range++ = '\0';
                }
-               multiinfo->ports[i] = parse_port(cp, proto);
+               multiinfo->ports[i] = xtables_parse_port(cp, proto);
                if (range) {
                        multiinfo->pflags[i] = 1;
-                       multiinfo->ports[++i] = parse_port(range, proto);
+                       multiinfo->ports[++i] = xtables_parse_port(range, proto);
                        if (multiinfo->ports[i-1] >= multiinfo->ports[i])
                                exit_error(PARAMETER_PROBLEM,
                                           "invalid portrange specified");

diff --git a/extensions/libxt_physdev.c b/extensions/libxt_physdev.c
index 0572aba9c40341b2ba823d74947e43fe863da780..6152cb374a226ee27cbf58aa0edbd8dc911036bf 100644 (file)
--- a/extensions/libxt_physdev.c
+++ b/extensions/libxt_physdev.c
@@ -44,7 +44,7 @@ physdev_parse(int c, char **argv, int invert, unsigned int *flags,
                if (*flags & XT_PHYSDEV_OP_IN)
                        goto multiple_use;
                check_inverse(optarg, &invert, &optind, 0);
-               parse_interface(argv[optind-1], info->physindev,
+               xtables_parse_interface(argv[optind-1], info->physindev,
                                (unsigned char *)info->in_mask);
                if (invert)
                        info->invert |= XT_PHYSDEV_OP_IN;
@@ -56,7 +56,7 @@ physdev_parse(int c, char **argv, int invert, unsigned int *flags,
                if (*flags & XT_PHYSDEV_OP_OUT)
                        goto multiple_use;
                check_inverse(optarg, &invert, &optind, 0);
-               parse_interface(argv[optind-1], info->physoutdev,
+               xtables_parse_interface(argv[optind-1], info->physoutdev,
                                (unsigned char *)info->out_mask);
                if (invert)
                        info->invert |= XT_PHYSDEV_OP_OUT;

diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c
index 37a6423ef01b7168e428353331dca00b06a122e2..6348a2f95de0ac8979d1971daeeef76a2054ea3d 100644 (file)
--- a/extensions/libxt_sctp.c
+++ b/extensions/libxt_sctp.c
@@ -85,14 +85,14 @@ parse_sctp_ports(const char *portstring,
        buffer = strdup(portstring);
        DEBUGP("%s\n", portstring);
        if ((cp = strchr(buffer, ':')) == NULL) {
-               ports[0] = ports[1] = parse_port(buffer, "sctp");
+               ports[0] = ports[1] = xtables_parse_port(buffer, "sctp");
        }
        else {
                *cp = '\0';
                cp++;
 
-               ports[0] = buffer[0] ? parse_port(buffer, "sctp") : 0;
-               ports[1] = cp[0] ? parse_port(cp, "sctp") : 0xFFFF;
+               ports[0] = buffer[0] ? xtables_parse_port(buffer, "sctp") : 0;
+               ports[1] = cp[0] ? xtables_parse_port(cp, "sctp") : 0xFFFF;
 
                if (ports[0] > ports[1])
                        exit_error(PARAMETER_PROBLEM,

diff --git a/extensions/libxt_tcp.c b/extensions/libxt_tcp.c
index 56bdba5d1036ba052893044fd4f8d02ae22de3cd..bb667478d328b8889bf71c947acba8d478db7587 100644 (file)
--- a/extensions/libxt_tcp.c
+++ b/extensions/libxt_tcp.c
@@ -44,13 +44,13 @@ parse_tcp_ports(const char *portstring, u_int16_t *ports)
 
        buffer = strdup(portstring);
        if ((cp = strchr(buffer, ':')) == NULL)
-               ports[0] = ports[1] = parse_port(buffer, "tcp");
+               ports[0] = ports[1] = xtables_parse_port(buffer, "tcp");
        else {
                *cp = '\0';
                cp++;
 
-               ports[0] = buffer[0] ? parse_port(buffer, "tcp") : 0;
-               ports[1] = cp[0] ? parse_port(cp, "tcp") : 0xFFFF;
+               ports[0] = buffer[0] ? xtables_parse_port(buffer, "tcp") : 0;
+               ports[1] = cp[0] ? xtables_parse_port(cp, "tcp") : 0xFFFF;
 
                if (ports[0] > ports[1])
                        exit_error(PARAMETER_PROBLEM,

diff --git a/extensions/libxt_udp.c b/extensions/libxt_udp.c
index f64fd1cf8d913a4e89e9ed7d4e86bb8f07567c0b..401284118e3660fe70060216e178c290653dea0f 100644 (file)
--- a/extensions/libxt_udp.c
+++ b/extensions/libxt_udp.c
@@ -36,13 +36,13 @@ parse_udp_ports(const char *portstring, u_int16_t *ports)
 
        buffer = strdup(portstring);
        if ((cp = strchr(buffer, ':')) == NULL)
-               ports[0] = ports[1] = parse_port(buffer, "udp");
+               ports[0] = ports[1] = xtables_parse_port(buffer, "udp");
        else {
                *cp = '\0';
                cp++;
 
-               ports[0] = buffer[0] ? parse_port(buffer, "udp") : 0;
-               ports[1] = cp[0] ? parse_port(cp, "udp") : 0xFFFF;
+               ports[0] = buffer[0] ? xtables_parse_port(buffer, "udp") : 0;
+               ports[1] = cp[0] ? xtables_parse_port(cp, "udp") : 0xFFFF;
 
                if (ports[0] > ports[1])
                        exit_error(PARAMETER_PROBLEM,

diff --git a/include/xtables.h.in b/include/xtables.h.in
index 936bbcc8fae12d8e015ddd990fbea6592791bc77..abde4d8648cd92fd4ef18045683514cfda6966e8 100644 (file)
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -194,10 +194,10 @@ extern bool xtables_strtoul(const char *, char **, unsigned long *,
        unsigned long, unsigned long);
 extern bool xtables_strtoui(const char *, char **, unsigned int *,
        unsigned int, unsigned int);
-extern int service_to_port(const char *name, const char *proto);
-extern u_int16_t parse_port(const char *port, const char *proto);
+extern int xtables_service_to_port(const char *name, const char *proto);
+extern u_int16_t xtables_parse_port(const char *port, const char *proto);
 extern void
-parse_interface(const char *arg, char *vianame, unsigned char *mask);
+xtables_parse_interface(const char *arg, char *vianame, unsigned char *mask);
 
 /* this is a special 64bit data type that is 8-byte aligned */
 #define aligned_u64 u_int64_t __attribute__((aligned(8)))

diff --git a/ip6tables.c b/ip6tables.c
index f741c521fa88e29d7b275013b8630c1672e75d2a..fd7327631f45cc9cd0d563a1525664d967d19438 100644 (file)
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -1700,7 +1700,7 @@ int do_command6(int argc, char *argv[], char **table, struct ip6tc_handle **hand
                        check_inverse(optarg, &invert, &optind, argc);
                        set_option(&options, OPT_VIANAMEIN, &fw.ipv6.invflags,
                                   invert);
-                       parse_interface(argv[optind-1],
+                       xtables_parse_interface(argv[optind-1],
                                        fw.ipv6.iniface,
                                        fw.ipv6.iniface_mask);
                        break;
@@ -1709,7 +1709,7 @@ int do_command6(int argc, char *argv[], char **table, struct ip6tc_handle **hand
                        check_inverse(optarg, &invert, &optind, argc);
                        set_option(&options, OPT_VIANAMEOUT, &fw.ipv6.invflags,
                                   invert);
-                       parse_interface(argv[optind-1],
+                       xtables_parse_interface(argv[optind-1],
                                        fw.ipv6.outiface,
                                        fw.ipv6.outiface_mask);
                        break;

diff --git a/iptables.c b/iptables.c
index d3906fc9a3b684f7738617ae3d4ad0f0c4009cf0..aeb40d8a5bcdc72cb152a61327cb92372eb7c581 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -1705,7 +1705,7 @@ int do_command(int argc, char *argv[], char **table, struct iptc_handle **handle
                        check_inverse(optarg, &invert, &optind, argc);
                        set_option(&options, OPT_VIANAMEIN, &fw.ip.invflags,
                                   invert);
-                       parse_interface(argv[optind-1],
+                       xtables_parse_interface(argv[optind-1],
                                        fw.ip.iniface,
                                        fw.ip.iniface_mask);
                        break;
@@ -1714,7 +1714,7 @@ int do_command(int argc, char *argv[], char **table, struct iptc_handle **handle
                        check_inverse(optarg, &invert, &optind, argc);
                        set_option(&options, OPT_VIANAMEOUT, &fw.ip.invflags,
                                   invert);
-                       parse_interface(argv[optind-1],
+                       xtables_parse_interface(argv[optind-1],
                                        fw.ip.outiface,
                                        fw.ip.outiface_mask);
                        break;

diff --git a/xtables.c b/xtables.c
index 859a82a513dcad5ff9fb209dd4065c66da92d889..a387ae0a2914bdd5de8216aa11e9b5a784e0b083 100644 (file)
--- a/xtables.c
+++ b/xtables.c
@@ -236,7 +236,7 @@ bool xtables_strtoui(const char *s, char **end, unsigned int *value,
        return ret;
 }
 
-int service_to_port(const char *name, const char *proto)
+int xtables_service_to_port(const char *name, const char *proto)
 {
        struct servent *service;
 
@@ -246,19 +246,20 @@ int service_to_port(const char *name, const char *proto)
        return -1;
 }
 
-u_int16_t parse_port(const char *port, const char *proto)
+u_int16_t xtables_parse_port(const char *port, const char *proto)
 {
        unsigned int portnum;
 
        if (xtables_strtoui(port, NULL, &portnum, 0, UINT16_MAX) ||
-           (portnum = service_to_port(port, proto)) != (unsigned)-1)
+           (portnum = xtables_service_to_port(port, proto)) != (unsigned)-1)
                return portnum;
 
        exit_error(PARAMETER_PROBLEM,
                   "invalid port/service `%s' specified", port);
 }
 
-void parse_interface(const char *arg, char *vianame, unsigned char *mask)
+void xtables_parse_interface(const char *arg, char *vianame,
+                            unsigned char *mask)
 {
        int vialen = strlen(arg);
        unsigned int i;