X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=b29b397475e5e304fb2e79b76e85e3713258a666;hb=b9006ce3cba742ca2a22d601ba1a63a47b0402c9;hp=d8216a1f22a11b36e87b083fd469e6b446622a88;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index d8216a1f2..b29b39747 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -1,28 +1,28 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2006-2008 Craig Edwards + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Oliver Lupton * - * 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 . */ -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "mode.h" -#include "inspircd.h" -#include "u_listmode.h" -#include "wildcard.h" -/* $ModDesc: Provides support for the +e channel mode */ -/* $ModDep: ../../include/u_listmode.h */ +#include "inspircd.h" +#include "listmode.h" /* Written by Om, April 2005. */ /* Rewritten to use the listmode utility by Om, December 2005 */ @@ -38,111 +38,74 @@ class BanException : public ListModeBase { public: - BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", "348", "349", true) { } + BanException(Module* Creator) : ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", 348, 349, true) { } }; class ModuleBanException : public Module { - BanException* be; - + BanException be; -public: - ModuleBanException(InspIRCd* Me) - : Module::Module(Me) - { - be = new BanException(ServerInstance); - ServerInstance->AddMode(be, 'e'); - } - - virtual void Implements(char* List) + public: + ModuleBanException() : be(this) { - be->DoImplements(List); - List[I_On005Numeric] = List[I_OnCheckBan] = 1; } - - virtual void On005Numeric(std::string &output) + + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - output.append(" EXCEPTS=e"); + tokens["EXCEPTS"] = "e"; } - virtual int OnCheckBan(userrec* user, chanrec* chan) + ModResult OnExtBanCheck(User *user, Channel *chan, char type) CXX11_OVERRIDE { - if (chan != NULL) + ListModeBase::ModeList* list = be.GetList(chan); + if (!list) + return MOD_RES_PASSTHRU; + + for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++) { - modelist* list; - chan->GetExt(be->GetInfoKey(), list); - - if (list) + if (it->mask[0] != type || it->mask[1] != ':') + continue; + + if (chan->CheckBan(user, it->mask.substr(2))) { - char mask[MAXBUF]; - snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString()); - for (modelist::iterator it = list->begin(); it != list->end(); it++) - { - if (ServerInstance->MatchText(user->GetFullRealHost(), it->mask) || ServerInstance->MatchText(user->GetFullHost(), it->mask) || (match(mask, it->mask.c_str(), true))) - { - // They match an entry on the list, so let them in. - return 1; - } - } - return 0; + // They match an entry on the list, so let them pass this. + return MOD_RES_ALLOW; } - // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything. } - return 0; - } - virtual void OnCleanup(int target_type, void* item) - { - be->DoCleanup(target_type, item); + return MOD_RES_PASSTHRU; } - virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) + ModResult OnCheckChannelBan(User* user, Channel* chan) CXX11_OVERRIDE { - be->DoSyncChannel(chan, proto, opaque); - } + ListModeBase::ModeList* list = be.GetList(chan); + if (!list) + { + // No list, proceed normally + return MOD_RES_PASSTHRU; + } - virtual void OnChannelDelete(chanrec* chan) - { - be->DoChannelDelete(chan); + for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++) + { + if (chan->CheckBan(user, it->mask)) + { + // They match an entry on the list, so let them in. + return MOD_RES_ALLOW; + } + } + return MOD_RES_PASSTHRU; } - virtual void OnRehash(const std::string ¶m) - { - be->DoRehash(); - } - - virtual Version GetVersion() - { - return Version(1, 1, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION); - } - - virtual ~ModuleBanException() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(be); - DELETE(be); + be.DoRehash(); } -}; -class ModuleBanExceptionFactory : public ModuleFactory -{ - public: - ModuleBanExceptionFactory() - { - } - - ~ModuleBanExceptionFactory() + Version GetVersion() CXX11_OVERRIDE { - } - - virtual Module* CreateModule(InspIRCd* Me) - { - return new ModuleBanException(Me); + return Version("Provides support for the +e channel mode", VF_VENDOR); } }; - -extern "C" void * init_module( void ) -{ - return new ModuleBanExceptionFactory; -} +MODULE_INIT(ModuleBanException)