IPv6 ICMP naming problem fix

diff --git a/extensions/libip6t_icmpv6.c b/extensions/libip6t_icmpv6.c
index 67302eb5ec53300df02c196f58f68e0dd1bdba9a..4185cada16a2c0ef9430e8f4b1fc37dd8355d67d 100644 (file)
--- a/extensions/libip6t_icmpv6.c
+++ b/extensions/libip6t_icmpv6.c
@@ -229,7 +229,7 @@ print(const struct ip6t_ip6 *ip,
 {
        const struct ip6t_icmp *icmpv6 = (struct ip6t_icmp *)match->data;
 
-       printf("icmpv6 ");
+       printf("ipv6-icmp ");
        print_icmpv6type(icmpv6->type, icmpv6->code[0], icmpv6->code[1],
                       icmpv6->invflags & IP6T_ICMP_INV,
                       numeric);
@@ -260,7 +260,7 @@ static void final_check(unsigned int flags)
 
 static struct ip6tables_match icmpv6
 = { NULL,
-    "icmpv6",
+    "icmp6",
     NETFILTER_VERSION,
     IP6T_ALIGN(sizeof(struct ip6t_icmp)),
     IP6T_ALIGN(sizeof(struct ip6t_icmp)),

diff --git a/ip6tables.c b/ip6tables.c
index 2d13f3af20d0430cfce300fe1e20a44b0ae01604..d60b2da15e43ac0a68da9d1e16e12a122039cc28 100644 (file)
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -517,8 +517,6 @@ host_to_addr(const char *name, unsigned int *naddr)
        return (struct in6_addr *) NULL;
 }
 
-/* XXX: the getnameinfo() returns "ai_family not supported".
- *      it can be a glibc error. */
 static char *
 addr_to_host(const struct in6_addr *addr)
 {
@@ -678,17 +676,34 @@ struct ip6tables_match *
 find_match(const char *name, enum ip6t_tryload tryload)
 {
        struct ip6tables_match *ptr;
-
-       for (ptr = ip6tables_matches; ptr; ptr = ptr->next) {
-               if (strcmp(name, ptr->name) == 0)
-                       break;
-       }
+       int icmphack = 0;
+  
+       /* This is ugly as hell. Nonetheless, there is no way of changing
+        * this without hurting backwards compatibility */
+       if ( (strcmp(name,"icmpv6") == 0) ||
+            (strcmp(name,"ipv6-icmp") == 0) ||
+            (strcmp(name,"icmp6") == 0) ) icmphack = 1;
+ 
+       if (!icmphack) {
+               for (ptr = ip6tables_matches; ptr; ptr = ptr->next) {
+                       if (strcmp(name, ptr->name) == 0)
+                               break;
+               }
+       } else {
+               for (ptr = ip6tables_matches; ptr; ptr = ptr->next) {
+                       if (strcmp("icmp6", ptr->name) == 0)
+                               break;
+               }
+       }
 
 #ifndef NO_SHARED_LIBS
        if (!ptr && tryload != DONT_LOAD) {
                char path[sizeof(IP6T_LIB_DIR) + sizeof("/libip6t_.so")
                         + strlen(name)];
-               sprintf(path, IP6T_LIB_DIR "/libip6t_%s.so", name);
+               if (!icmphack)
+                       sprintf(path, IP6T_LIB_DIR "/libip6t_%s.so", name);
+               else
+                       sprintf(path, IP6T_LIB_DIR "/libip6t_%s.so", "icmpv6");
                if (dlopen(path, RTLD_NOW)) {
                        /* Found library.  If it didn't register itself,
                           maybe they specified target as match. */
@@ -1652,6 +1667,7 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle)
        struct ip6tables_target *t;
        const char *jumpto = "";
        char *protocol = NULL;
+       char icmp6p[] = "icmpv6";
         const char *modprobe = NULL;
 
        memset(&fw, 0, sizeof(fw));
@@ -1825,6 +1841,8 @@ 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;