Include explicit routing information in Command, will replace CMD_LOCALONLY return...

[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 bfb64449fd394451b9821afd7a1234fdae3797f3..93267e03c3420dbc11c4217114792e4bf31e3f13 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -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 */
@@ -38,110 +37,138 @@ class BanException : public ListModeBase
 
 class ModuleBanException : public Module
 {
-       BanException* be;
-       
+       BanException be;
 
 public:
-       ModuleBanException(InspIRCd* Me) : Module(Me)
+       ModuleBanException(InspIRCd* Me) : Module(Me), be(Me)
        {
-               be = new BanException(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(be))
+               if (!ServerInstance->Modes->AddMode(&be))
                        throw ModuleException("Could not add new modes!");
                ServerInstance->Modules->PublishInterface("ChannelBanList", this);
 
-               be->DoImplements(this);
-               Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnCheckBan };
-               Me->Modules->Attach(list, this, 4);
+               be.DoImplements(this);
+               Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnCheckBan, I_OnCheckExtBan, I_OnCheckStringExtBan };
+               Me->Modules->Attach(list, this, 6);
 
        }
-       
+
        virtual void On005Numeric(std::string &output)
        {
                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))
+                                       // They match an entry on the list, so let them in.
+                                       return 1;
+                       }
+               }
+
+               return 0;
+       }
+
        virtual int OnCheckBan(User* user, Channel* chan)
        {
                if (chan != NULL)
                {
                        modelist* list;
-                       chan->GetExt(be->GetInfoKey(), list);
-                       
+                       chan->GetExt(be.GetInfoKey(), list);
+
                        if (!list)
                        {
                                // No list, proceed normally
                                return 0;
                        }
 
-                       char mask[MAXBUF];
-                       snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
-
+                       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;
                                }
                        }
                }
-               return 0;       
+               return 0;
        }
 
        virtual void OnCleanup(int target_type, void* item)
        {
-               be->DoCleanup(target_type, item);
+               be.DoCleanup(target_type, item);
        }
 
        virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
-               be->DoSyncChannel(chan, proto, opaque);
+               be.DoSyncChannel(chan, proto, opaque);
        }
 
        virtual void OnChannelDelete(Channel* chan)
        {
-               be->DoChannelDelete(chan);
+               be.DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(User* user, const std::string &param)
+       virtual void OnRehash(User* user)
        {
-               be->DoRehash();
+               be.DoRehash();
        }
 
        virtual const char* OnRequest(Request* request)
        {
-               ListModeRequest* LM = (ListModeRequest*)request;
-               if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
-               {
-                       modelist* list;
-                       LM->chan->GetExt(be->GetInfoKey(), list);
-                       if (list)
-                       {
-                               char mask[MAXBUF];
-                               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)))
-                                       {
-                                               // They match an entry
-                                               return (char*)it->mask.c_str();
-                                       }
-                               }
-                               return NULL;
-                       }
-               }
-               return NULL;
+               return be.DoOnRequest(request);
        }
 
        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()
        {
-               ServerInstance->Modes->DelMode(be);
-               delete be;
+               ServerInstance->Modes->DelMode(&be);
                ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
        }
 };