Test stuff to fix remote stats brokage

[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 707085b144cd9afa0db06a72e5e7befd51352fd5..ae28075c00bb2e0867719aae2b8c89c007380e8a 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -83,7 +83,6 @@ class CloakUser : public ModeHandler
                                        unsigned int iv[] = { key1, key2, key3, key4 };
                                        std::string a = (n1 ? n1 : n2);
                                        std::string b;
-                                       insp_inaddr testaddr;
 
                                        /** Reset the Hash module, and send it our IV and hex table */
                                        HashResetRequest(Sender, HashProvider).Send();
@@ -98,16 +97,28 @@ class CloakUser : public ModeHandler
                                         * Their ISP shouldnt go to town on subdomains, or they shouldnt have a kiddie
                                         * vhost.
                                         */
-
-                                       if ((insp_aton(dest->host,&testaddr) < 1) && (hostcloak.length() <= 64))
-                                       {
-                                               // if they have a hostname, make something appropriate
+#ifdef IPV6
+                                       in6_addr testaddr;
+                                       in_addr testaddr2;
+                                       if ((dest->GetProtocolFamily() == AF_INET6) && (inet_pton(AF_INET6,dest->host,&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,&testaddr2) < 1) && (hostcloak.length() <= 64))
+                                               /* Invalid ipv4 address, and ipv4 user (resolved host) */
+                                               b = hostcloak;
+                                       else
+                                               /* Valid ipv6 or ipv4 address (not resolved) ipv4 or ipv6 user */
+                                               b = ((!strchr(dest->host,':')) ? Cloak4(dest->host) : Cloak6(dest->host));
+#else
+                                       in_addr testaddr;
+                                       if ((inet_aton(dest->host,&testaddr) < 1) && (hostcloak.length() <= 64))
+                                               /* Invalid ipv4 address, and ipv4 user (resolved host) */
                                                b = hostcloak;
-                                       }
                                        else
-                                       {
-                                               b = ((b.find(':') == std::string::npos) ? Cloak4(dest->host) : Cloak6(dest->host));
-                                       }
+                                               /* Valid ipv4 address (not resolved) ipv4 user */
+                                               b = Cloak4(dest->host);
+#endif
+
                                        dest->ChangeDisplayedHost(b.c_str());
                                }
                                
@@ -165,6 +176,11 @@ 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 = "";