-#include <stdio.h>
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ * E-mail:
+ * <brain@chatspike.net>
+ * <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
#include <string>
#include <vector>
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
+#include "mode.h"
+#include "inspircd.h"
#include "u_listmode.h"
+#include "wildcard.h"
/* $ModDesc: Provides support for the +e channel mode */
// 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
+
+
+/** Handles +e channel mode
+ */
+class BanException : public ListModeBase
+{
+ public:
+ BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", "348", "349", true) { }
+};
-class ModuleBanException : public ListModeBaseModule
+class ModuleBanException : public Module
{
+ BanException* be;
+
+
public:
- ModuleBanException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'e', "End of Channel Exception List", "348", "349")
+ ModuleBanException(InspIRCd* Me)
+ : Module::Module(Me)
{
+ be = new BanException(ServerInstance);
+ ServerInstance->AddMode(be, 'e');
}
virtual void Implements(char* List)
{
- this->DoImplements(List);
+ be->DoImplements(List);
List[I_On005Numeric] = List[I_OnCheckBan] = 1;
}
virtual void On005Numeric(std::string &output)
{
output.append(" EXCEPTS=e");
- InsertMode(output, "e", 1);
}
virtual int OnCheckBan(userrec* user, chanrec* chan)
{
- if(chan != NULL)
+ if (chan != NULL)
{
- modelist* list = (modelist*)chan->GetExt(infokey);
- Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for ban exceptions");
+ modelist* list;
+ chan->GetExt(be->GetInfoKey(), list);
- if(list)
+ if (list)
{
+ 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(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask))
+ {
+ 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;
}
// 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);
+ }
+
+ virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+ {
+ be->DoSyncChannel(chan, proto, opaque);
+ }
+
+ virtual void OnChannelDelete(chanrec* chan)
+ {
+ be->DoChannelDelete(chan);
+ }
+
+ virtual void OnRehash(const std::string ¶m)
+ {
+ be->DoRehash();
+ }
virtual Version GetVersion()
{
- return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR);
+ return Version(1, 0, 0, 3, VF_COMMON | VF_VENDOR);
+ }
+
+ virtual ~ModuleBanException()
+ {
+ ServerInstance->Modes->DelMode(be);
+ DELETE(be);
}
};
{
}
- virtual Module* CreateModule(Server* serv)
+ virtual Module* CreateModule(InspIRCd* Me)
{
- return new ModuleBanException(serv);
+ return new ModuleBanException(Me);
}
-
};