Windows support. Tested and working to compile on freebsd and linux. Next step is...

[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 5232cfa94d7c43873f93e12a65303f094a14fa24..88c2c507f76213b38077350ec435bd48796ecbd0 100644 (file)
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,14 +1,26 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 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 <string>
 #include <vector>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "mode.h"
-#include "helperfuncs.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.
@@ -17,49 +29,55 @@
  * 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:
-       InviteException(Server* serv) : ListModeBase(serv, 'I', "End of Channel Invite Exception List", "346", "347", true) { }
+       InviteException(InspIRCd* Instance) : ListModeBase(Instance, 'I', "End of Channel Invite Exception List", "346", "347", true) { }
 };
 
 class ModuleInviteException : public Module
 {
        InviteException* ie;
-       Server* Srv;
-
 public:
-       ModuleInviteException(Server* serv) : Module(serv)
+       ModuleInviteException(InspIRCd* Me) : Module(Me)
        {
-               ie = new InviteException(serv);
-               Srv = serv;
+               ie = new InviteException(ServerInstance);
+               if (!ServerInstance->AddMode(ie, 'I'))
+                       throw ModuleException("Could not add new modes!");
+               ServerInstance->PublishInterface("ChannelBanList", this);
        }
-       
+
        virtual void Implements(char* List)
        {
                ie->DoImplements(List);
-               List[I_On005Numeric] = List[I_OnCheckInvite] = 1;
+               List[I_OnRequest] = 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(ie->GetInfoKey());
-                       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;
@@ -72,6 +90,31 @@ public:
                return 0;               
        }
 
+       virtual 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);
@@ -87,14 +130,21 @@ public:
                ie->DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(const std::string &param)
+       virtual void OnRehash(userrec* user, 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);
+               ServerInstance->UnpublishInterface("ChannelBanList", this);
        }
 };
 
@@ -110,15 +160,15 @@ class ModuleInviteExceptionFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* serv)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleInviteException(serv);
+               return new ModuleInviteException(Me);
        }
        
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleInviteExceptionFactory;
 }