Remove the intercomm system since sqlite is synchronous.

[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 1a1ff039e180245edc5f2d1cb2956b111a5aaa52..c0ebbc99bfdbe0f92d2a4985b97f811e9c7a2a51 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -57,7 +57,7 @@ class CloakUser : public ModeHandler
                }
 
                /* don't allow this user to spam modechanges */
-               dest->IncreasePenalty(5);
+               IS_LOCAL(dest)->Penalty += 5;
 
                if (adding)
                {
@@ -74,10 +74,10 @@ class CloakUser : public ModeHandler
 
                                std::string* cloak = ext.get(dest);
 
-                               if (!cloak)
+                               if (!cloak && IS_LOCAL(dest))
                                {
                                        /* Force creation of missing cloak */
-                                       creator->OnUserConnect(dest);
+                                       creator->OnUserConnect(IS_LOCAL(dest));
                                        cloak = ext.get(dest);
                                }
                                if (cloak)
@@ -305,7 +305,7 @@ class ModuleCloaking : public Module
        void CloakExistingUsers()
        {
                std::string* cloak;
-               for (std::vector<User*>::iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); u++)
+               for (std::vector<LocalUser*>::iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); u++)
                {
                        cloak = cu.ext.get(*u);
                        if (!cloak)
@@ -377,10 +377,10 @@ class ModuleCloaking : public Module
                         * We must limit the keys or else we get different results on
                         * amd64/x86 boxes. - psychon */
                        const unsigned int limit = 0x80000000;
-                       compatkey[1] = (unsigned int) Conf.ReadInteger("cloak","key1",0,false);
-                       compatkey[2] = (unsigned int) Conf.ReadInteger("cloak","key2",0,false);
-                       compatkey[3] = (unsigned int) Conf.ReadInteger("cloak","key3",0,false);
-                       compatkey[4] = (unsigned int) Conf.ReadInteger("cloak","key4",0,false);
+                       compatkey[0] = (unsigned int) Conf.ReadInteger("cloak","key1",0,false);
+                       compatkey[1] = (unsigned int) Conf.ReadInteger("cloak","key2",0,false);
+                       compatkey[2] = (unsigned int) Conf.ReadInteger("cloak","key3",0,false);
+                       compatkey[3] = (unsigned int) Conf.ReadInteger("cloak","key4",0,false);
 
                        if (!lowercase)
                        {
@@ -400,17 +400,17 @@ class ModuleCloaking : public Module
                        if (prefix.empty())
                                prefix = ServerInstance->Config->Network;
 
-                       if (!compatkey[1] || !compatkey[2] || !compatkey[3] || !compatkey[4] ||
-                               compatkey[1] >= limit || compatkey[2] >= limit || compatkey[3] >= limit || compatkey[4] >= limit)
+                       if (!compatkey[0] || !compatkey[1] || !compatkey[2] || !compatkey[3] ||
+                               compatkey[0] >= limit || compatkey[1] >= limit || compatkey[2] >= limit || compatkey[3] >= limit)
                        {
                                std::string detail;
-                               if (!compatkey[1] || compatkey[1] >= limit)
+                               if (!compatkey[0] || compatkey[0] >= limit)
                                        detail = "<cloak:key1> is not valid, it may be set to a too high/low value, or it may not exist.";
-                               else if (!compatkey[2] || compatkey[2] >= limit)
+                               else if (!compatkey[1] || compatkey[1] >= limit)
                                        detail = "<cloak:key2> is not valid, it may be set to a too high/low value, or it may not exist.";
-                               else if (!compatkey[3] || compatkey[3] >= limit)
+                               else if (!compatkey[2] || compatkey[2] >= limit)
                                        detail = "<cloak:key3> is not valid, it may be set to a too high/low value, or it may not exist.";
-                               else if (!compatkey[4] || compatkey[4] >= limit)
+                               else if (!compatkey[3] || compatkey[3] >= limit)
                                        detail = "<cloak:key4> is not valid, it may be set to a too high/low value, or it may not exist.";
 
                                throw ModuleException("You have not defined cloak keys for m_cloaking!!! THIS IS INSECURE AND SHOULD BE CHECKED! - " + detail);
@@ -424,7 +424,7 @@ class ModuleCloaking : public Module
                }
        }
 
-       void OnUserConnect(User* dest)
+       void OnUserConnect(LocalUser* dest)
        {
                std::string* cloak = cu.ext.get(dest);
                if (cloak)