Remove some debug (im on a crusade to make debug mode useful, but at the same time...

[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 ef1bb01a906824e281a5181b1177400fcd3e34fd..707085b144cd9afa0db06a72e5e7befd51352fd5 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -71,8 +68,11 @@ class CloakUser : public ModeHandler
                                 * naming in their hostname (e.g. if they are on a lan or
                                 * are connecting via localhost) -- this doesnt matter much.
                                 */
+
+                               char* n1 = strchr(dest->host,'.');
+                               char* n2 = strchr(dest->host,':');
                        
-                               if (strchr(dest->host,'.') || strchr(dest->host,':'))
+                               if (n1 || n2)
                                {
                                        /* InspIRCd users have two hostnames; A displayed
                                         * hostname which can be modified by modules (e.g.
@@ -81,22 +81,17 @@ class CloakUser : public ModeHandler
                                         */
 
                                        unsigned int iv[] = { key1, key2, key3, key4 };
-                                       char* n = strstr(dest->host,".");
-                                       if (!n)
-                                               n = strstr(dest->host,":");
-
-                                       std::string a = n;
-
+                                       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();
                                        HashKeyRequest(Sender, HashProvider, iv).Send();
-                                       HashHexRequest(Sender, HashProvider, xtab[0]);
+                                       HashHexRequest(Sender, HashProvider, xtab[(*dest->host) % 4]);
 
                                        /* Generate a cloak using specialized Hash */
-                                       std::string hostcloak = prefix + "-" + HashSumRequest(Sender, HashProvider, dest->host).Send() + a;
+                                       std::string hostcloak = prefix + "-" + std::string(HashSumRequest(Sender, HashProvider, dest->host).Send()).substr(0,8) + a;
 
                                        /* Fix by brain - if the cloaked host is > the max length of a host (64 bytes
                                         * according to the DNS RFC) then tough titty, they get cloaked as an IP. 
@@ -159,7 +154,7 @@ class CloakUser : public ModeHandler
                HashKeyRequest(Sender, HashProvider, iv).Send();
 
                /* Send the Hash module a different hex table for each octet group's Hash sum */
-               for (int k = 0; k < 3; k++)
+               for (int k = 0; k < 4; k++)
                {
                        HashHexRequest(Sender, HashProvider, xtab[(iv[k]+i[k]) % 4]).Send();
                        ra[k] = std::string(HashSumRequest(Sender, HashProvider, octet[k]).Send()).substr(0,6);
@@ -216,10 +211,7 @@ class CloakUser : public ModeHandler
                        prefix = ServerInstance->Config->Network;
 
                if (!key1 && !key2 && !key3 && !key4)
-               {
-                       ModuleException ex("You have not defined cloak keys for m_cloaking!!! THIS IS INSECURE AND SHOULD BE CHECKED!");
-                       throw (ex);
-               }
+                       throw ModuleException("You have not defined cloak keys for m_cloaking!!! THIS IS INSECURE AND SHOULD BE CHECKED!");
        }
 };
 
@@ -235,7 +227,9 @@ class ModuleCloaking : public Module
        ModuleCloaking(InspIRCd* Me)
                : Module::Module(Me)
        {
-               /* Attempt to locate the Hash service provider, bail if we can't find it */
+               ServerInstance->UseInterface("HashRequest");
+
+               /* Attempt to locate the md5 service provider, bail if we can't find it */
                HashModule = ServerInstance->FindModule("m_md5.so");
                if (!HashModule)
                        throw ModuleException("Can't find m_md5.so. Please load m_md5.so before m_cloaking.so.");
@@ -244,15 +238,17 @@ class ModuleCloaking : public Module
                cu = new CloakUser(ServerInstance, this, HashModule);
 
                /* Register it with the core */         
-               ServerInstance->AddMode(cu, 'x');
+               if (!ServerInstance->AddMode(cu, 'x'))
+                       throw ModuleException("Could not add new modes!");
 
-               OnRehash("");
+               OnRehash(NULL,"");
        }
        
        virtual ~ModuleCloaking()
        {
                ServerInstance->Modes->DelMode(cu);
                DELETE(cu);
+               ServerInstance->DoneWithInterface("HashRequest");
        }
        
        virtual Version GetVersion()
@@ -262,7 +258,7 @@ class ModuleCloaking : public Module
                return Version(1,1,0,2,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                cu->DoRehash();
        }