Switch <stdint.h> test to use a test file too.

[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 9137c09d9239583f7b268d42e7d53b724c312eba..1811f743de59e5dd7fc64124b1d66ba5ccb9cb32 100644 (file)
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -1,16 +1,26 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "u_listmode.h"
 
@@ -31,7 +41,7 @@
 class BanException : public ListModeBase
 {
  public:
-       BanException(InspIRCd* Instance, Module* Creator) : ListModeBase(Instance, Creator, 'e', "End of Channel Exception List", 348, 349, true) { }
+       BanException(Module* Creator) : ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", 348, 349, true) { }
 };
 
 
@@ -40,24 +50,25 @@ class ModuleBanException : public Module
        BanException be;
 
 public:
-       ModuleBanException(InspIRCd* Me) : Module(Me), be(Me, this)
+       ModuleBanException() : be(this)
        {
-               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, I_OnCheckExtBan, I_OnCheckStringExtBan };
-               Me->Modules->Attach(list, this, 6);
+       void init()
+       {
+               ServerInstance->Modules->AddService(be);
 
+               be.DoImplements(this);
+               Implementation list[] = { I_OnRehash, I_On005Numeric, I_OnExtBanCheck, I_OnCheckChannelBan };
+               ServerInstance->Modules->Attach(list, this, sizeof(list)/sizeof(Implementation));
        }
 
-       virtual void On005Numeric(std::string &output)
+       void On005Numeric(std::string &output)
        {
                output.append(" EXCEPTS=e");
        }
 
-       virtual ModResult OnCheckExtBan(User *user, Channel *chan, char type)
+       ModResult OnExtBanCheck(User *user, Channel *chan, char type)
        {
                if (chan != NULL)
                {
@@ -66,15 +77,12 @@ public:
                        if (!list)
                                return MOD_RES_PASSTHRU;
 
-                       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)))
+                               if (chan->CheckBan(user, it->mask.substr(2)))
                                {
                                        // They match an entry on the list, so let them pass this.
                                        return MOD_RES_ALLOW;
@@ -85,32 +93,9 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       virtual ModResult OnCheckStringExtBan(const std::string &str, Channel *chan, char type)
+       ModResult OnCheckChannelBan(User* user, Channel* chan)
        {
-               if (chan != NULL)
-               {
-                       modelist *list = be.extItem.get(chan);
-
-                       if (!list)
-                               return MOD_RES_PASSTHRU;
-                       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 MOD_RES_ALLOW;
-                       }
-               }
-
-               return MOD_RES_PASSTHRU;
-       }
-
-       virtual ModResult OnCheckBan(User* user, Channel* chan)
-       {
-               if (chan != NULL)
+               if (chan)
                {
                        modelist *list = be.extItem.get(chan);
 
@@ -120,10 +105,9 @@ public:
                                return MOD_RES_PASSTHRU;
                        }
 
-                       std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
                        for (modelist::iterator it = list->begin(); it != list->end(); it++)
                        {
-                               if (InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
+                               if (chan->CheckBan(user, it->mask))
                                {
                                        // They match an entry on the list, so let them in.
                                        return MOD_RES_ALLOW;
@@ -133,35 +117,19 @@ public:
                return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnCleanup(int target_type, void* item)
-       {
-               be.DoCleanup(target_type, item);
-       }
-
-       virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+       void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
                be.DoSyncChannel(chan, proto, opaque);
        }
 
-       virtual void OnRehash(User* user)
+       void OnRehash(User* user)
        {
                be.DoRehash();
        }
 
-       virtual const char* OnRequest(Request* request)
-       {
-               return be.DoOnRequest(request);
-       }
-
-       virtual Version GetVersion()
-       {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
-       }
-
-       virtual ~ModuleBanException()
+       Version GetVersion()
        {
-               ServerInstance->Modes->DelMode(&be);
-               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
+               return Version("Provides support for the +e channel mode", VF_VENDOR);
        }
 };