-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+#include "inspircd.h"
#include "u_listmode.h"
/* $ModDesc: Provides support for the +I channel mode */
+/* $ModDep: ../../include/u_listmode.h */
/*
* Written by Om <om@inspircd.org>, April 2005.
* The +I channel mode takes a nick!ident@host, glob patterns allowed,
* and if a user matches an entry on the +I list then they can join the channel,
* ignoring if +i is set on the channel
+ * Now supports CIDR and IP addresses -- Brain
*/
class InspIRCd* ServerInstance;
+/** Handles channel mode +I
+ */
class InviteException : public ListModeBase
{
public:
class ModuleInviteException : public Module
{
InviteException* ie;
-
-
public:
ModuleInviteException(InspIRCd* Me) : Module(Me)
{
ie = new InviteException(ServerInstance);
- ServerInstance->AddMode(ie, 'I');
- }
-
- virtual void Implements(char* List)
- {
- ie->DoImplements(List);
- List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
+ if (!ServerInstance->Modes->AddMode(ie))
+ throw ModuleException("Could not add new modes!");
+ ServerInstance->Modules->PublishInterface("ChannelBanList", this);
+
+ ie->DoImplements(this);
+ Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite };
+ ServerInstance->Modules->Attach(eventlist, this, 3);
}
virtual void On005Numeric(std::string &output)
output.append(" INVEX=I");
}
- virtual int OnCheckInvite(userrec* user, chanrec* chan)
+ virtual int OnCheckInvite(User* user, Channel* chan)
{
if(chan != NULL)
{
chan->GetExt(ie->GetInfoKey(), 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(match(user->GetFullRealHost(), it->mask.c_str()) || match(user->GetFullHost(), it->mask.c_str()))
+ if(match(user->GetFullRealHost(), it->mask.c_str()) || match(user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
{
// They match an entry on the list, so let them in.
return 1;
return 0;
}
+ virtual const char* OnRequest(Request* request)
+ {
+ ListModeRequest* LM = (ListModeRequest*)request;
+ if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
+ {
+ modelist* list;
+ LM->chan->GetExt(ie->GetInfoKey(), list);
+ if (list)
+ {
+ char mask[MAXBUF];
+ snprintf(mask, MAXBUF, "%s!%s@%s", LM->user->nick, LM->user->ident, LM->user->GetIPString());
+ for (modelist::iterator it = list->begin(); it != list->end(); it++)
+ {
+ if (match(LM->user->GetFullRealHost(), it->mask.c_str()) || match(LM->user->GetFullHost(), it->mask.c_str()) || (match(mask, it->mask.c_str(), true)))
+ {
+ // They match an entry
+ return (char*)it->mask.c_str();
+ }
+ }
+ return NULL;
+ }
+ }
+ return NULL;
+ }
+
virtual void OnCleanup(int target_type, void* item)
{
ie->DoCleanup(target_type, item);
}
- virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+ virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
{
ie->DoSyncChannel(chan, proto, opaque);
}
- virtual void OnChannelDelete(chanrec* chan)
+ virtual void OnChannelDelete(Channel* chan)
{
ie->DoChannelDelete(chan);
}
- virtual void OnRehash(const std::string ¶m)
+ virtual void OnRehash(User* user, const std::string ¶m)
{
ie->DoRehash();
}
virtual Version GetVersion()
{
- return Version(1, 0, 0, 3, VF_VENDOR | VF_STATIC);
+ return Version(1, 1, 0, 3, VF_VENDOR | VF_COMMON, API_VERSION);
}
-};
-
-class ModuleInviteExceptionFactory : public ModuleFactory
-{
- public:
- ModuleInviteExceptionFactory()
+ ~ModuleInviteException()
{
+ ServerInstance->Modes->DelMode(ie);
+ delete ie;
+ ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
}
-
- ~ModuleInviteExceptionFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleInviteException(Me);
- }
-
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleInviteExceptionFactory;
-}
+MODULE_INIT(ModuleInviteException)