Merge branch 'insp20' into master.

[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 f9a7fa38027cc28b2b1b9e81e0d77dba00ae04a3..5152442311b3127f641c10ffa1ffd2a86f701a63 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -42,18 +42,22 @@ static const char base32[] = "0123456789abcdefghijklmnopqrstuv";
 class CloakUser : public ModeHandler
 {
  public:
+       bool active;
        LocalStringExt ext;
        std::string debounce_uid;
        time_t debounce_ts;
        int debounce_count;
 
        CloakUser(Module* source)
-               : ModeHandler(source, "cloak", 'x', PARAM_NONE, MODETYPE_USER),
-               ext("cloaked_host", ExtensionItem::EXT_USER, source), debounce_ts(0), debounce_count(0)
+               : ModeHandler(source, "cloak", 'x', PARAM_NONE, MODETYPE_USER)
+               , active(false)
+               , ext("cloaked_host", ExtensionItem::EXT_USER, source)
+               , debounce_ts(0)
+               , debounce_count(0)
        {
        }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
        {
                LocalUser* user = IS_LOCAL(dest);
 
@@ -63,6 +67,8 @@ class CloakUser : public ModeHandler
                 */
                if (!user)
                {
+                       // Remote setters broadcast mode before host while local setters do the opposite, so this takes that into account
+                       active = IS_LOCAL(source) ? adding : !adding;
                        dest->SetMode(this, adding);
                        return MODEACTION_ALLOW;
                }
@@ -131,7 +137,7 @@ class CommandCloak : public Command
                syntax = "<host>";
        }
 
-       CmdResult Handle(const std::vector<std::string> &parameters, User *user);
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE;
 };
 
 class ModuleCloaking : public Module
@@ -146,7 +152,11 @@ class ModuleCloaking : public Module
        unsigned int domainparts;
        dynamic_reference<HashProvider> Hash;
 
-       ModuleCloaking() : cu(this), mode(MODE_OPAQUE), ck(this), Hash(this, "hash/md5")
+       ModuleCloaking()
+               : cu(this)
+               , mode(MODE_OPAQUE)
+               , ck(this)
+               , Hash(this, "hash/md5")
        {
        }
 
@@ -187,7 +197,7 @@ class ModuleCloaking : public Module
         * @param id A unique ID for this type of item (to make it unique if the item matches)
         * @param len The length of the output. Maximum for MD5 is 16 characters.
         */
-       std::string SegmentCloak(const std::string& item, char id, int len)
+       std::string SegmentCloak(const std::string& item, char id, size_t len)
        {
                std::string input;
                input.reserve(key.length() + 3 + item.length());
@@ -197,7 +207,7 @@ class ModuleCloaking : public Module
                input.append(item);
 
                std::string rv = Hash->GenerateRaw(input).substr(0,len);
-               for(int i=0; i < len; i++)
+               for(size_t i = 0; i < len; i++)
                {
                        // this discards 3 bits per byte. We have an
                        // overabundance of bits in the hash output, doesn't
@@ -210,8 +220,8 @@ class ModuleCloaking : public Module
        std::string SegmentIP(const irc::sockets::sockaddrs& ip, bool full)
        {
                std::string bindata;
-               int hop1, hop2, hop3;
-               int len1, len2;
+               size_t hop1, hop2, hop3;
+               size_t len1, len2;
                std::string rv;
                if (ip.sa.sa_family == AF_INET6)
                {
@@ -300,11 +310,12 @@ class ModuleCloaking : public Module
        // mode change, we will call SetMode back to true AFTER the host change is done.
        void OnChangeHost(User* u, const std::string& host) CXX11_OVERRIDE
        {
-               if (u->IsModeSet(cu))
+               if (u->IsModeSet(cu) && !cu.active)
                {
                        u->SetMode(cu, false);
                        u->WriteCommand("MODE", "-" + ConvToStr(cu.GetModeChar()));
                }
+               cu.active = false;
        }
 
        Version GetVersion() CXX11_OVERRIDE
@@ -342,7 +353,7 @@ class ModuleCloaking : public Module
                if (modestr == "half")
                {
                        mode = MODE_HALF_CLOAK;
-                       domainparts = tag->getInt("domainparts", 3, 1, 10);
+                       domainparts = tag->getUInt("domainparts", 3, 1, 10);
                }
                else if (modestr == "full")
                        mode = MODE_OPAQUE;