From d80c89992996ea5a58576e8d55a047243143876f Mon Sep 17 00:00:00 2001 From: "/C=DE/ST=Berlin/L=Berlin/O=Netfilter Project/OU=Development/CN=kaber/emailAddress=kaber@netfilter.org" Date: Sat, 22 Jul 2006 14:10:53 +0000 Subject: [PATCH] proto_to_name duplication (Phil Oester ) Update multiport match to use the iptables version of proto_to_name instead of reinventing the wheel. --- extensions/libipt_multiport.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'extensions') diff --git a/extensions/libipt_multiport.c b/extensions/libipt_multiport.c index 2a10abd..28fd850 100644 --- a/extensions/libipt_multiport.c +++ b/extensions/libipt_multiport.c @@ -51,23 +51,6 @@ static struct option opts[] = { {0} }; -static char * -proto_to_name(u_int8_t proto) -{ - switch (proto) { - case IPPROTO_TCP: - return "tcp"; - case IPPROTO_UDP: - return "udp"; - case IPPROTO_SCTP: - return "sctp"; - case IPPROTO_DCCP: - return "dccp"; - default: - return NULL; - } -} - static unsigned int parse_multi_ports(const char *portstring, u_int16_t *ports, const char *proto) { @@ -143,7 +126,7 @@ check_proto(const struct ipt_entry *entry) exit_error(PARAMETER_PROBLEM, "multiport only works with TCP or UDP"); - if ((proto = proto_to_name(entry->ip.proto)) != NULL) + if ((proto = proto_to_name(entry->ip.proto, 1)) != NULL) return proto; else if (!entry->ip.proto) exit_error(PARAMETER_PROBLEM, @@ -264,7 +247,7 @@ port_to_service(int port, u_int8_t proto) { struct servent *service; - if ((service = getservbyport(htons(port), proto_to_name(proto)))) + if ((service = getservbyport(htons(port), proto_to_name(proto, 1)))) return service->s_name; return NULL; -- cgit v1.2.3