update to iptables-1.3.8

[iptables.git] / extensions / libipt_dccp.c

diff --git a/extensions/libipt_dccp.c b/extensions/libipt_dccp.c
index af1d20e..e5782a8 100644 (file)
--- a/extensions/libipt_dccp.c
+++ b/extensions/libipt_dccp.c
@@ -56,31 +56,6 @@ static struct option opts[] = {
        { .name = 0 }
 };
 
-static int
-service_to_port(const char *name)
-{
-       struct servent *service;
-
-       if ((service = getservbyname(name, "dccp")) != NULL)
-               return ntohs((unsigned short) service->s_port);
-
-       return -1;
-}
-
-static u_int16_t
-parse_dccp_port(const char *port)
-{
-       unsigned int portnum;
-
-       DEBUGP("%s\n", port);
-       if (string_to_number(port, 0, 65535, &portnum) != -1 ||
-           (portnum = service_to_port(port)) != -1)
-               return (u_int16_t)portnum;
-
-       exit_error(PARAMETER_PROBLEM,
-                  "invalid DCCP port/service `%s' specified", port);
-}
-
 static void
 parse_dccp_ports(const char *portstring, 
                 u_int16_t *ports)
@@ -91,14 +66,14 @@ parse_dccp_ports(const char *portstring,
        buffer = strdup(portstring);
        DEBUGP("%s\n", portstring);
        if ((cp = strchr(buffer, ':')) == NULL) {
-               ports[0] = ports[1] = parse_dccp_port(buffer);
+               ports[0] = ports[1] = parse_port(buffer, "dccp");
        }
        else {
                *cp = '\0';
                cp++;
 
-               ports[0] = buffer[0] ? parse_dccp_port(buffer) : 0;
-               ports[1] = cp[0] ? parse_dccp_port(cp) : 0xFFFF;
+               ports[0] = buffer[0] ? parse_port(buffer, "dccp") : 0;
+               ports[1] = cp[0] ? parse_port(cp, "dccp") : 0xFFFF;
 
                if (ports[0] > ports[1])
                        exit_error(PARAMETER_PROBLEM,