-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
-#include "helperfuncs.h"
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ * 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 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"
/* $ModDesc: Provides support for the +e channel mode */
+/* $ModDep: ../../include/u_listmode.h */
/* Written by Om<om@inspircd.org>, April 2005. */
/* Rewritten to use the listmode utility by Om, December 2005 */
// The +e channel mode takes a nick!ident@host, glob patterns allowed,
// and if a user matches an entry on the +e list then they can join the channel, overriding any (+b) bans set on them
+// Now supports CIDR and IP addresses -- Brain
-extern InspIRCd* ServerInstance;
+/** Handles +e channel mode
+ */
class BanException : public ListModeBase
{
public:
- BanException(InspIRCd* Instance, Server* serv) : ListModeBase(Instance, serv, '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;
- Server* Srv;
+ BanException be;
public:
- ModuleBanException(Server* serv)
- : Module::Module(serv)
+ ModuleBanException() : be(this)
{
- be = new BanException(ServerInstance, serv);
- Srv = serv;
- Srv->AddMode(be, 'e');
}
-
- virtual void Implements(char* List)
+
+ void init()
{
- be->DoImplements(List);
- List[I_On005Numeric] = List[I_OnCheckBan] = 1;
+ 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");
- ServerInstance->ModeGrok->InsertMode(output, "e", 1);
}
- virtual int OnCheckBan(userrec* user, chanrec* chan)
+ ModResult OnExtBanCheck(User *user, Channel *chan, char type)
{
- if(chan != NULL)
+ if (chan != NULL)
{
- modelist* list;
- chan->GetExt(be->GetInfoKey(), list);
-
- if(list)
+ modelist *list = be.extItem.get(chan);
+
+ if (!list)
+ return MOD_RES_PASSTHRU;
+
+ for (modelist::iterator it = list->begin(); it != list->end(); it++)
{
- for (modelist::iterator it = list->begin(); it != list->end(); it++)
- if(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask))
- // They match an entry on the list, so let them in.
- return 1;
- return 0;
+ if (it->mask.length() <= 2 || it->mask[0] != type || it->mask[1] != ':')
+ continue;
+
+ if (chan->CheckBan(user, it->mask.substr(2)))
+ {
+ // 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)
{
- be->DoSyncChannel(chan, proto, opaque);
- }
+ if (chan)
+ {
+ modelist *list = be.extItem.get(chan);
- virtual void OnChannelDelete(chanrec* chan)
- {
- be->DoChannelDelete(chan);
- }
+ if (!list)
+ {
+ // No list, proceed normally
+ return MOD_RES_PASSTHRU;
+ }
- virtual void OnRehash(const std::string ¶m)
- {
- be->DoRehash();
- }
-
- virtual Version GetVersion()
- {
- return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR);
- }
-
- virtual ~ModuleBanException()
- {
- DELETE(be);
+ for (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;
}
-};
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
- ModuleBanExceptionFactory()
+ void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
{
+ be.DoSyncChannel(chan, proto, opaque);
}
-
- ~ModuleBanExceptionFactory()
+
+ void OnRehash(User* user)
{
+ be.DoRehash();
}
-
- virtual Module* CreateModule(Server* serv)
+
+ Version GetVersion()
{
- return new ModuleBanException(serv);
+ return Version("Provides support for the +e channel mode", VF_VENDOR);
}
-
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleBanExceptionFactory;
-}
+MODULE_INIT(ModuleBanException)