[netfilter-cvslog] r6650 - in trunk/iptables: . extensions include

[kaber at netfilter.org]

Author: kaber at netfilter.org
Date: 2006-07-22 16:10:53 +0200 (Sat, 22 Jul 2006)
New Revision: 6650

Modified:
   trunk/iptables/extensions/libipt_multiport.c
   trunk/iptables/include/iptables.h
   trunk/iptables/iptables.c
Log:
[PATCH] proto_to_name duplication (Phil Oester <kernel at linuxace.com>)

Update multiport match to use the iptables version of proto_to_name
instead of reinventing the wheel.


Modified: trunk/iptables/extensions/libipt_multiport.c
===================================================================
--- trunk/iptables/extensions/libipt_multiport.c	2006-07-22 14:07:52 UTC (rev 6649)
+++ trunk/iptables/extensions/libipt_multiport.c	2006-07-22 14:10:53 UTC (rev 6650)
@@ -51,23 +51,6 @@
 	{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 @@
 		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 @@
 {
 	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;

Modified: trunk/iptables/include/iptables.h
===================================================================
--- trunk/iptables/include/iptables.h	2006-07-22 14:07:52 UTC (rev 6649)
+++ trunk/iptables/include/iptables.h	2006-07-22 14:10:53 UTC (rev 6650)
@@ -151,6 +151,7 @@
 extern void register_match(struct iptables_match *me);
 extern void register_target(struct iptables_target *me);
 
+extern char *proto_to_name(u_int8_t proto, int nolookup);
 extern int service_to_port(const char *name, const char *proto);
 extern u_int16_t parse_port(const char *port, const char *proto);
 extern struct in_addr *dotted_to_addr(const char *dotted);

Modified: trunk/iptables/iptables.c
===================================================================
--- trunk/iptables/iptables.c	2006-07-22 14:07:52 UTC (rev 6649)
+++ trunk/iptables/iptables.c	2006-07-22 14:10:53 UTC (rev 6650)
@@ -229,9 +229,10 @@
 	{ "esp", IPPROTO_ESP },
 	{ "ah", IPPROTO_AH },
 	{ "sctp", IPPROTO_SCTP },
+	{ "dccp", IPPROTO_DCCP },
 };
 
-static char *
+char *
 proto_to_name(u_int8_t proto, int nolookup)
 {
 	unsigned int i;