Fix silly oversight discovered by tra26 (thanks!) where the core tries to handle...

[user/henk/code/inspircd.git] / src / modules / m_cloaking.cpp

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 58de93da9d305fbe9cb3f19951f7e6ad4b10ab32..a5e3773e43a87abb2ef7023819062a2b87757440 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -160,11 +160,6 @@ class CloakUser : public ModeHandler
 
        std::string Cloak6(const char* ip)
        {
-               /* Theyre using 4in6 (YUCK). Translate as ipv4 cloak */
-               if (!strncmp(ip, "0::ffff:", 8))
-                       return Cloak4(ip + 8);
-
-               /* If we get here, yes it really is an ipv6 ip */
                unsigned int iv[] = { key1, key2, key3, key4 };
                std::vector<std::string> hashies;
                std::string item;
@@ -418,10 +413,8 @@ class ModuleCloaking : public Module
 #ifdef IPV6
                                in6_addr testaddr;
                                in_addr testaddr2;
-                               if ((dest->GetProtocolFamily() == AF_INET6) &&
-                                       (inet_pton(AF_INET6,dest->host.c_str(),&testaddr) < 1) &&
-                                       (inet_aton(dest->host.c_str(),&testaddr2) < 1) && (hostcloak.length() <= 64))
-                                       /* Invalid ipv4/ipv6 address, and ipv6 user (resolved host) */
+                               if ((dest->GetProtocolFamily() == AF_INET6) && (inet_pton(AF_INET6,dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))
+                                       /* Invalid ipv6 address, and ipv6 user (resolved host) */
                                        b = hostcloak;
                                else if ((dest->GetProtocolFamily() == AF_INET) && (inet_aton(dest->host.c_str(),&testaddr2) < 1) && (hostcloak.length() <= 64))
                                        /* Invalid ipv4 address, and ipv4 user (resolved host) */