X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=35b30f0d46aaf14843782cb9ebfd090da050bc10;hb=4a64082e31c3c3dfa97a1edfb8a3c97fe8d32ea7;hp=ef8dc4d9166ac6e05bf8f8b0847a21234a9b29fe;hpb=9941a616cbba8ad5dec07bdf908a1d08d81e568e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp
index ef8dc4d91..35b30f0d4 100644
--- a/src/modules/m_banexception.cpp
+++ b/src/modules/m_banexception.cpp
@@ -1,14 +1,21 @@
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/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 +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 */
@@ -16,112 +23,119 @@
 
 // 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(Server* serv) : ListModeBase(serv, 'e', "End of Channel Exception List", "348", "349", true) { }
+	BanException(Module* Creator) : ListModeBase(Creator, '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)
-	{
-		be = new BanException(serv);
-		Srv = serv;
-		Srv->AddMode(be, 'e');
-	}
-	
-	virtual void Implements(char* List)
+	ModuleBanException() : be(this)
 	{
-		be->DoImplements(List);
-		List[I_On005Numeric] = List[I_OnCheckBan] = 1;
+		if (!ServerInstance->Modes->AddMode(&be))
+			throw ModuleException("Could not add new modes!");
+		ServerInstance->Modules->PublishInterface("ChannelBanList", this);
+
+		be.DoImplements(this);
+		Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnExtBanCheck, I_OnCheckChannelBan };
+		ServerInstance->Modules->Attach(list, this, 5);
+
 	}
-	
-	virtual void On005Numeric(std::string &output)
+
+	void On005Numeric(std::string &output)
 	{
 		output.append(" EXCEPTS=e");
-		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);
-			Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for ban exceptions");
-			
-			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[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;
+			}
+
+			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;
 	}
 
-	virtual void OnRehash(const std::string &param)
+	void OnCleanup(int target_type, void* item)
 	{
-		be->DoRehash();
+		be.DoCleanup(target_type, item);
 	}
-	
-	virtual Version GetVersion()
+
+	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
 	{
-		return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR);
+		be.DoSyncChannel(chan, proto, opaque);
 	}
-	
-	virtual ~ModuleBanException()
+
+	void OnRehash(User* user)
 	{
-		DELETE(be);	
+		be.DoRehash();
 	}
-};
 
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
-	ModuleBanExceptionFactory()
+	const char* OnRequest(Request* request)
 	{
+		return be.DoOnRequest(request);
 	}
-	
-	~ModuleBanExceptionFactory()
+
+	Version GetVersion()
 	{
+		return Version("Provides support for the +e channel mode", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
-	
-	virtual Module* CreateModule(Server* serv)
+
+	~ModuleBanException()
 	{
-		return new ModuleBanException(serv);
+		ServerInstance->Modes->DelMode(&be);
+		ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleBanExceptionFactory;
-}
+MODULE_INIT(ModuleBanException)