Remove unneeded #ifdef IPV6 lines

[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 a5e3773e43a87abb2ef7023819062a2b87757440..ae409ae9327c7e426db283d87bf290ee89942859 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -267,7 +267,7 @@ class ModuleCloaking : public Module
 
                try
                {
-                       OnRehash(NULL,"");
+                       OnRehash(NULL);
                }
                catch (ModuleException &e)
                {
@@ -332,11 +332,11 @@ class ModuleCloaking : public Module
        void Prioritize()
        {
                /* Needs to be after m_banexception etc. */
-               ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIO_LAST);
+               ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST);
 
                /* but before m_conn_umodes, so host is generated ready to apply */
                Module *um = ServerInstance->Modules->Find("m_conn_umodes.so");
-               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_AFTER, &um);
+               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_AFTER, &um);
        }
 
        virtual void OnUserDisconnect(User* user)
@@ -369,7 +369,7 @@ class ModuleCloaking : public Module
                return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                cu->DoRehash();
        }
@@ -410,35 +410,21 @@ class ModuleCloaking : public Module
                                 * Their ISP shouldnt go to town on subdomains, or they shouldnt have a kiddie
                                 * vhost.
                                 */
-#ifdef IPV6
-                               in6_addr testaddr;
-                               in_addr testaddr2;
-                               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) */
-                                       b = hostcloak;
-                               else
-                                       /* Valid ipv6 or ipv4 address (not resolved) ipv4 or ipv6 user */
-                                       b = ((!strchr(dest->host.c_str(),':')) ? cu->Cloak4(dest->host.c_str()) : cu->Cloak6(dest->host.c_str()));
-#else
-                               in_addr testaddr;
-                               if ((inet_aton(dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))
-                                       /* Invalid ipv4 address, and ipv4 user (resolved host) */
+                               std::string testaddr;
+                               int testport;
+                               if (!irc::sockets::satoap(&dest->client_sa, testaddr, testport) && (hostcloak.length() <= 64))
+                                       /* not a valid address, must have been a host, so cloak as a host */
                                        b = hostcloak;
+                               else if (dest->client_sa.sa.sa_family == AF_INET6)
+                                       b = cu->Cloak6(dest->GetIPString());
                                else
-                                       /* Valid ipv4 address (not resolved) ipv4 user */
-                                       b = cu->Cloak4(dest->host.c_str());
-#endif
+                                       b = cu->Cloak4(dest->GetIPString());
                        }
                        else
                        {
-#ifdef IPV6
-                               if (dest->GetProtocolFamily() == AF_INET6)
+                               if (dest->client_sa.sa.sa_family == AF_INET6)
                                        b = cu->Cloak6(dest->GetIPString());
-#endif
-                               if (dest->GetProtocolFamily() == AF_INET)
+                               else
                                        b = cu->Cloak4(dest->GetIPString());
                        }