[netfilter-cvslog] r6581 - trunk/iptables

[yasuyuki at netfilter.org]

Author: yasuyuki at netfilter.org
Date: 2006-04-15 05:09:37 +0200 (Sat, 15 Apr 2006)
New Revision: 6581

Modified:
   trunk/iptables/ip6tables.c
Log:
[IP6TABLES] kill manual comparing protocol name with "ipv6-icmp".



Modified: trunk/iptables/ip6tables.c
===================================================================
--- trunk/iptables/ip6tables.c	2006-04-15 03:05:41 UTC (rev 6580)
+++ trunk/iptables/ip6tables.c	2006-04-15 03:09:37 UTC (rev 6581)
@@ -222,6 +222,7 @@
 	{ "tcp", IPPROTO_TCP },
 	{ "udp", IPPROTO_UDP },
 	{ "icmpv6", IPPROTO_ICMPV6 },
+	{ "ipv6-icmp", IPPROTO_ICMPV6 },
 	{ "esp", IPPROTO_ESP },
 	{ "ah", IPPROTO_AH },
 };
@@ -1759,7 +1760,6 @@
 	char *protocol = NULL;
 	const char *modprobe = NULL;
 	int proto_used = 0;
-	char icmp6p[] = "icmpv6";
 
 	memset(&fw, 0, sizeof(fw));
 
@@ -1928,8 +1928,6 @@
 				*protocol = tolower(*protocol);
 
 			protocol = argv[optind-1];
-			if ( strcmp(protocol,"ipv6-icmp") == 0)
-				protocol = icmp6p;
 			fw.ipv6.proto = parse_protocol(protocol);
 			fw.ipv6.flags |= IP6T_F_PROTO;