X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=432bfbb89f097a6ed1b297d3df7189c2faf9fa08;hb=02c6ce1ad09a7471a6b03dc00bac4b843d157489;hp=be5dc68ae2db40deb942340ba72bd3f180cd8e06;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index be5dc68ae..432bfbb89 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -11,12 +11,10 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <map>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +f (message flood protection) */
 
@@ -82,14 +80,14 @@ class MsgFlood : public ModeHandler
  public:
 	MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-        {
+	ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+	{
 		floodsettings* x;
-        	if (channel->GetExt("flood",x))
+		if (channel->GetExt("flood",x))
 			return std::make_pair(true, (x->ban ? "*" : "")+ConvToStr(x->lines)+":"+ConvToStr(x->secs));
-                else
-                        return std::make_pair(false, parameter);
-        }
+		else
+			return std::make_pair(false, parameter);
+	}
 
 	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
 	{
@@ -137,14 +135,14 @@ class MsgFlood : public ModeHandler
 				if ((nlines<1) || (nsecs<1))
 				{
 					source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
-					parameter = "";
+					parameter.clear();
 					return MODEACTION_DENY;
 				}
 				else
 				{
 					if (!channel->GetExt("flood", f))
 					{
-						parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+						parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
 						floodsettings *f = new floodsettings(ban,nsecs,nlines);
 						channel->Extend("flood",f);
 						channel->SetMode('f', true);
@@ -153,11 +151,11 @@ class MsgFlood : public ModeHandler
 					}
 					else
 					{
-						if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)))
+						if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
 						{
 							delete f;
 							floodsettings *f = new floodsettings(ban,nsecs,nlines);
-							parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+							parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
 							channel->Shrink("flood");
 							channel->Extend("flood",f);
 							channel->SetModeParam('f', parameter.c_str(), true);
@@ -169,7 +167,7 @@ class MsgFlood : public ModeHandler
 			else
 			{
 				source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
-				parameter = "";
+				parameter.clear();
 				return MODEACTION_DENY;
 			}
 		}
@@ -196,47 +194,52 @@ class ModuleMsgFlood : public Module
  public:
  
 	ModuleMsgFlood(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
 		
 		mf = new MsgFlood(ServerInstance);
-		ServerInstance->AddMode(mf, 'f');
+		if (!ServerInstance->AddMode(mf, 'f'))
+			throw ModuleException("Could not add new modes!");
 	}
 	
 	void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
 	{
-		if (IS_LOCAL(user))
+		if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)
 		{
-			floodsettings *f;
-			if (dest->GetExt("flood", f))
+			return;
+		}
+
+		floodsettings *f;
+		if (dest->GetExt("flood", f))
+		{
+			f->addmessage(user);
+			if (f->shouldkick(user))
 			{
-				f->addmessage(user);
-				if (f->shouldkick(user))
+				/* Youre outttta here! */
+				f->clear(user);
+				if (f->ban)
 				{
-					/* Youre outttta here! */
-					f->clear(user);
-					if (f->ban)
-					{
-						const char* parameters[3];
-						parameters[0] = dest->name;
-						parameters[1] = "+b";
-						parameters[2] = user->MakeWildHost();
-						ServerInstance->SendMode(parameters,3,user);
-						std::deque<std::string> n;
-						/* Propogate the ban to other servers.
-						 * We dont know what protocol we may be using,
-						 * so this event is picked up by our protocol
-						 * module and formed into a ban command that
-						 * suits the protocol in use.
-						 */
-						n.push_back(dest->name);
-						n.push_back("+b");
-						n.push_back(user->MakeWildHost());
-						Event rmode((char *)&n, NULL, "send_mode");
-						rmode.Send(ServerInstance);
-					}
-					dest->ServerKickUser(user, "Channel flood triggered (mode +f)", true);
+					const char* parameters[3];
+					parameters[0] = dest->name;
+					parameters[1] = "+b";
+					parameters[2] = user->MakeWildHost();
+					ServerInstance->SendMode(parameters,3,user);
+					std::deque<std::string> n;
+					/* Propogate the ban to other servers.
+					 * We dont know what protocol we may be using,
+					 * so this event is picked up by our protocol
+					 * module and formed into a ban command that
+					 * suits the protocol in use.
+					 */
+					n.push_back(dest->name);
+					n.push_back("+b");
+					n.push_back(user->MakeWildHost());
+					Event rmode((char *)&n, NULL, "send_mode");
+					rmode.Send(ServerInstance);
 				}
+				char kickmessage[MAXBUF];
+				snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
+				dest->ServerKickUser(user, kickmessage, true);
 			}
 		}
 	}
@@ -304,7 +307,7 @@ class ModuleMsgFloodFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleMsgFloodFactory;
 }