And, just because I can. The one pointless one-liner of the evening. :p

[user/henk/code/inspircd.git] / src / channels.cpp

diff --git a/src/channels.cpp b/src/channels.cpp
index d917edb84b6bfd03f4a301594ba56ccd19091eb2..f169efb87db31e766d17c7cc9926d3389370db1e 100644 (file)
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -451,18 +451,15 @@ bool Channel::IsBanned(User* user)
        return false;
 }
 
-bool Channel::IsExtBanned(User *user, char type)
+bool Channel::IsExtBanned(const std::string &str, char type)
 {
-       char mask[MAXBUF];
        int MOD_RESULT = 0;
-       FOREACH_RESULT(I_OnCheckExtBan,OnCheckExtBan(user, this, type));
+       FOREACH_RESULT(I_OnCheckStringExtBan, OnCheckStringExtBan(str, this, type));
 
        if (MOD_RESULT == -1)
                return true;
        else if (MOD_RESULT == 0)
        {
-               snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
-
                for (BanList::iterator i = this->bans.begin(); i != this->bans.end(); i++)
                {
                        if (i->data[0] != type || i->data[1] != ':')
@@ -470,21 +467,42 @@ bool Channel::IsExtBanned(User *user, char type)
 
                        // Iterate past char and : to get to the mask without doing a data copy(!)
                        std::string maskptr = i->data.substr(2);
+                       ServerInstance->Logs->Log("EXTBANS", DEBUG, "Checking %s against %s, type is %c", str.c_str(), maskptr.c_str(), type);
 
-                       /* This allows CIDR ban matching
-                        *
-                        *        Full masked host                             Full unmasked host                     IP with/without CIDR
-                       */
-                       if ((match(user->GetFullHost(), maskptr)) || (match(user->GetFullRealHost(), maskptr)) || (match(mask, maskptr, true)))
-                       {
+                       if (match(str, maskptr))
                                return true;
-                       }
                }
        }
 
        return false;
 }
 
+bool Channel::IsExtBanned(User *user, char type)
+{
+       int MOD_RESULT = 0;
+       FOREACH_RESULT(I_OnCheckExtBan, OnCheckExtBan(user, this, type));
+
+       if (MOD_RESULT == -1)
+               return true;
+       else if (MOD_RESULT == 0)
+       {
+               char mask[MAXBUF];
+               snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), user->GetIPString());
+
+               // XXX: we should probably hook cloaked hosts in here somehow too..
+               if (this->IsExtBanned(mask, type))
+                       return true;
+
+               if (this->IsExtBanned(user->GetFullHost(), type))
+                       return true;
+
+               if (this->IsExtBanned(user->GetFullRealHost(), type))
+                       return true;
+       }
+
+       return false;
+}
+
 /* Channel::PartUser
  * remove a channel from a users record, and return the number of users left.
  * Therefore, if this function returns 0 the caller should delete the Channel.