Next part of Development/Hooking (see wiki)

[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 20e821e85de8d14c3cd8b23d64fa2a874bc77402..99cf1dc0ffa8408f33f879a9e220355c2ede477b 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "m_hash.h"
 
 /* $ModDesc: Provides masking of user hostnames */
@@ -70,7 +67,7 @@ class CloakUser : public ModeHandler
        {
        }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (source != dest)
                        return MODEACTION_DENY;
@@ -81,6 +78,9 @@ class CloakUser : public ModeHandler
                if (!IS_LOCAL(dest))
                        return MODEACTION_ALLOW;
 
+               /* don't allow this user to spam modechanges */
+               dest->IncreasePenalty(5);
+
                if (adding)
                {
                        if(!dest->IsModeSet('x'))
@@ -192,7 +192,7 @@ class CloakUser : public ModeHandler
 
                for (int j = 0; j < 4; j++)
                {
-                       octet[j] = seps.GetToken();
+                       seps.GetToken(octet[j]);
                        i[j] = atoi(octet[j].c_str());
                }
 
@@ -257,12 +257,17 @@ class CloakUser : public ModeHandler
        {
                ConfigReader Conf(ServerInstance);
                bool lowercase;
-
+               
+               /* These are *not* using the need_positive parameter of ReadInteger - 
+                * that will limit the valid values to only the positive values in a
+                * signed int. Instead, accept any value that fits into an int and
+                * cast it to an unsigned int. That will, a bit oddly, give us the full
+                * spectrum of an unsigned integer. - Special */
                key1 = key2 = key3 = key4 = 0;
-               key1 = Conf.ReadInteger("cloak","key1",0,true);
-               key2 = Conf.ReadInteger("cloak","key2",0,true);
-               key3 = Conf.ReadInteger("cloak","key3",0,true);
-               key4 = Conf.ReadInteger("cloak","key4",0,true);
+               key1 = (unsigned int) Conf.ReadInteger("cloak","key1",0,false);
+               key2 = (unsigned int) Conf.ReadInteger("cloak","key2",0,false);
+               key3 = (unsigned int) Conf.ReadInteger("cloak","key3",0,false);
+               key4 = (unsigned int) Conf.ReadInteger("cloak","key4",0,false);
                prefix = Conf.ReadValue("cloak","prefix",0);
                ipalways = Conf.ReadFlag("cloak", "ipalways", 0);
                lowercase = Conf.ReadFlag("cloak", "lowercase", 0);
@@ -314,10 +319,10 @@ class ModuleCloaking : public Module
        ModuleCloaking(InspIRCd* Me)
                : Module(Me)
        {
-               ServerInstance->UseInterface("HashRequest");
+               ServerInstance->Modules->UseInterface("HashRequest");
 
                /* Attempt to locate the md5 service provider, bail if we can't find it */
-               HashModule = ServerInstance->FindModule("m_md5.so");
+               HashModule = ServerInstance->Modules->Find("m_md5.so");
                if (!HashModule)
                        throw ModuleException("Can't find m_md5.so. Please load m_md5.so before m_cloaking.so.");
 
@@ -325,7 +330,7 @@ class ModuleCloaking : public Module
                cu = new CloakUser(ServerInstance, this, HashModule);
 
                /* Register it with the core */         
-               if (!ServerInstance->AddMode(cu, 'x'))
+               if (!ServerInstance->AddMode(cu))
                        throw ModuleException("Could not add new modes!");
 
                OnRehash(NULL,"");
@@ -335,7 +340,7 @@ class ModuleCloaking : public Module
        {
                ServerInstance->Modes->DelMode(cu);
                DELETE(cu);
-               ServerInstance->DoneWithInterface("HashRequest");
+               ServerInstance->Modules->DoneWithInterface("HashRequest");
        }
        
        virtual Version GetVersion()
@@ -345,7 +350,7 @@ class ModuleCloaking : public Module
                return Version(1,1,0,2,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                cu->DoRehash();
        }