Untested! New m_watch that should be hundreds of times faster (im not joking either)

[user/henk/code/inspircd.git] / src / modules / m_inviteexception.cpp

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 0b80934f74ccafb0f8cf1efbefa151808903d775..4985d6cb1a3fa97c7e3cbdb77d7e3659c2f2b19d 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,13 +1,29 @@
-#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 "u_listmode.h"
 
 /* $ModDesc: Provides support for the +I channel mode */
+/* $ModDep: ../../include/u_listmode.h */
 
 /*
  * Written by Om <om@inspircd.org>, April 2005.
@@ -16,38 +32,53 @@
  * 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 ModuleInviteException : public ListModeBaseModule
+class InspIRCd* ServerInstance;
+
+/** Handles channel mode +I
+ */
+class InviteException : public ListModeBase
 {
+ public:
+       InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", "346", "347", true) { }
+};
+
+class ModuleInviteException : public Module
+{
+       InviteException* ie;
 public:
-       ModuleInviteException(Server* serv) : ListModeBaseModule::ListModeBaseModule(serv, 'I', "End of Channel Invite Exception List", "346", "347")
+       ModuleInviteException(InspIRCd* Me) : Module(Me)
        {
+               ie = new InviteException(ServerInstance);
+               ServerInstance->AddMode(ie, 'I');
        }
        
        virtual void Implements(char* List)
        {
-               this->DoImplements(List);
+               ie->DoImplements(List);
                List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
        }
        
        virtual void On005Numeric(std::string &output)
        {
                output.append(" INVEX=I");
-               InsertMode(output, "I", 1);
        }
         
        virtual int OnCheckInvite(userrec* user, chanrec* chan)
        {
                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 invite exceptions");
+                       modelist* list;
+                       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(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask))
+                                       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;
@@ -59,10 +90,36 @@ public:
 
                return 0;               
        }
+
+       virtual void OnCleanup(int target_type, void* item)
+       {
+               ie->DoCleanup(target_type, item);
+       }
+
+       virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+       {
+               ie->DoSyncChannel(chan, proto, opaque);
+       }
+
+       virtual void OnChannelDelete(chanrec* chan)
+       {
+               ie->DoChannelDelete(chan);
+       }
+
+       virtual void OnRehash(const std::string &param)
+       {
+               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);
+       }
+
+       ~ModuleInviteException()
+       {
+               ServerInstance->Modes->DelMode(ie);
+               DELETE(ie);
        }
 };
 
@@ -78,9 +135,9 @@ class ModuleInviteExceptionFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* serv)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleInviteException(serv);
+               return new ModuleInviteException(Me);
        }
        
 };