X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=e142af0debb80dcbab223344c4169a24374ac46b;hb=1031f333332cf1b09db4fd632f141143ee637c34;hp=93267e03c3420dbc11c4217114792e4bf31e3f13;hpb=2630a87bb13b089e6d0fdcff4bcd0f3a9612e52f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index 93267e03c..e142af0de 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -1,21 +1,28 @@ -/* +------------------------------------+ - * | 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 + * 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 "inspircd.h" -#include "u_listmode.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 */ @@ -31,7 +38,7 @@ 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) { } }; @@ -39,137 +46,85 @@ class ModuleBanException : public Module { BanException be; -public: - ModuleBanException(InspIRCd* Me) : Module(Me), be(Me) + public: + ModuleBanException() : be(this) + { + } + + void init() CXX11_OVERRIDE { - if (!ServerInstance->Modes->AddMode(&be)) - throw ModuleException("Could not add new modes!"); - ServerInstance->Modules->PublishInterface("ChannelBanList", this); + ServerInstance->Modules->AddService(be); 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) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - output.append(" EXCEPTS=e"); + tokens["EXCEPTS"] = "e"; } - virtual int OnCheckExtBan(User *user, Channel *chan, char type) + ModResult OnExtBanCheck(User *user, Channel *chan, char type) CXX11_OVERRIDE { if (chan != NULL) { - modelist *list; - chan->GetExt(be.GetInfoKey(), list); + ListModeBase::ModeList *list = be.GetList(chan); if (!list) - return 0; + 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++) + for (ListModeBase::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 1; + return MOD_RES_ALLOW; } } } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnCheckStringExtBan(const std::string &str, Channel *chan, char type) + ModResult OnCheckChannelBan(User* user, Channel* chan) CXX11_OVERRIDE { - if (chan != NULL) + if (chan) { - 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); + ListModeBase::ModeList *list = be.GetList(chan); if (!list) { // No list, proceed normally - return 0; + 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++) + for (ListModeBase::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 1; + return MOD_RES_ALLOW; } } } - return 0; - } - - virtual void OnCleanup(int target_type, void* item) - { - be.DoCleanup(target_type, item); + return MOD_RES_PASSTHRU; } - virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque) + void OnSyncChannel(Channel* chan, Module* proto, void* opaque) CXX11_OVERRIDE { be.DoSyncChannel(chan, proto, opaque); } - virtual void OnChannelDelete(Channel* chan) - { - be.DoChannelDelete(chan); - } - - virtual void OnRehash(User* user) + void OnRehash(User* user) CXX11_OVERRIDE { 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() CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(&be); - ServerInstance->Modules->UnpublishInterface("ChannelBanList", this); + return Version("Provides support for the +e channel mode", VF_VENDOR); } };