From: Yasuyuki KOZAKAI <yasuyuki@netfilter.org>
Date: Sat, 15 Apr 2006 03:09:37 +0000 (+0000)
Subject: [IP6TABLES] kill manual comparing protocol name with "ipv6-icmp".
X-Git-Tag: v1.3.6~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85872c845cdc79d10a5485f443cafefb720678c2;p=thirdparty%2Fiptables.git

[IP6TABLES] kill manual comparing protocol name with "ipv6-icmp".
---

diff --git a/ip6tables.c b/ip6tables.c
index 00c4f6db..a375a2e9 100644
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -222,6 +222,7 @@ static const struct pprot chain_protos[] = {
 	{ "tcp", IPPROTO_TCP },
 	{ "udp", IPPROTO_UDP },
 	{ "icmpv6", IPPROTO_ICMPV6 },
+	{ "ipv6-icmp", IPPROTO_ICMPV6 },
 	{ "esp", IPPROTO_ESP },
 	{ "ah", IPPROTO_AH },
 };
@@ -1759,7 +1760,6 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
 	char *protocol = NULL;
 	const char *modprobe = NULL;
 	int proto_used = 0;
-	char icmp6p[] = "icmpv6";
 
 	memset(&fw, 0, sizeof(fw));
 
@@ -1928,8 +1928,6 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
 				*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;