Of course, it DOES help to actually initialise the Mutex objects, and delete them...

[user/henk/code/inspircd.git] / src / modules / m_banexception.cpp

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index 2a0bafc25ec4eab4db4b430c06bb102dcaf7d759..34a52f82b47ff07685b160919648091eb5009193 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -13,7 +13,6 @@
 
 #include "inspircd.h"
 #include "u_listmode.h"
-#include "wildcard.h"
 
 /* $ModDesc: Provides support for the +e channel mode */
 /* $ModDep: ../../include/u_listmode.h */
@@ -50,8 +49,8 @@ public:
                ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
                be->DoImplements(this);
-               Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnCheckBan };
-               Me->Modules->Attach(list, this, 4);
+               Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnCheckBan, I_OnCheckExtBan, I_OnCheckStringExtBan };
+               Me->Modules->Attach(list, this, 6);
 
        }
 
@@ -60,6 +59,58 @@ public:
                output.append(" EXCEPTS=e");
        }
 
+       virtual int OnCheckExtBan(User *user, Channel *chan, char type)
+       {
+               if (chan != NULL)
+               {
+                       modelist *list;
+                       chan->GetExt(be->GetInfoKey(), list);
+
+                       if (!list)
+                               return 0;
+
+                       std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
+                       for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                       {
+                               if (it->mask[0] != type || it->mask[1] != ':')
+                                       continue;
+
+                               std::string maskptr = it->mask.substr(2);
+
+                               if (InspIRCd::Match(user->GetFullRealHost(), maskptr) || InspIRCd::Match(user->GetFullHost(), maskptr) || (InspIRCd::MatchCIDR(mask, maskptr)))
+                               {
+                                       // They match an entry on the list, so let them pass this.
+                                       return 1;
+                               }
+                       }
+               }
+
+               return 0;
+       }
+
+       virtual int OnCheckStringExtBan(const std::string &str, Channel *chan, char type)
+       {
+               if (chan != NULL)
+               {
+                       modelist *list;
+                       chan->GetExt(be->GetInfoKey(), list);
+
+                       if (!list)
+                               return 0;
+                       for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                       {
+                               if (it->mask[0] != type || it->mask[1] != ':')
+                                       continue;
+
+                               std::string maskptr = it->mask.substr(2);
+                               if (InspIRCd::Match(str, maskptr))
+                                       return 1; // matches
+                       }
+               }
+
+               return 0;
+       }
+
        virtual int OnCheckBan(User* user, Channel* chan)
        {
                if (chan != NULL)
@@ -76,7 +127,7 @@ public:
                        std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
                        for (modelist::iterator it = list->begin(); it != list->end(); it++)
                        {
-                               if (match(user->GetFullRealHost(), it->mask) || match(user->GetFullHost(), it->mask) || (match(mask, it->mask, true)))
+                               if (InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
                                {
                                        // They match an entry on the list, so let them in.
                                        return 1;
@@ -118,7 +169,7 @@ public:
                                std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
                                for (modelist::iterator it = list->begin(); it != list->end(); it++)
                                {
-                                       if (match(LM->user->GetFullRealHost(), it->mask) || match(LM->user->GetFullHost(), it->mask) || (match(mask, it->mask, true)))
+                                       if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
                                        {
                                                // They match an entry
                                                return (char*)it->mask.c_str();
@@ -132,7 +183,7 @@ public:
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
        virtual ~ModuleBanException()