X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=51e20fe7ee4bc5e4d073b8a3facce0e3761f41ba;hb=e6d000042ea75d4e0485bec9564b47163a3ca414;hp=ae458a0d6eb93a0f2b59c7209ef05075f748ce0b;hpb=9cf56d917d92959701694477f7944d45ad2c38ed;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index ae458a0d6..51e20fe7e 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <map>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +f (message flood protection) */
@@ -82,14 +77,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,7 +132,7 @@ 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
@@ -153,15 +148,29 @@ class MsgFlood : public ModeHandler
 					}
 					else
 					{
-						if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
+						std::string cur_param = channel->GetModeParameter('f');
+						parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+						if (cur_param == parameter)
 						{
-							delete f;
-							floodsettings *f = new floodsettings(ban,nsecs,nlines);
-							parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
-							channel->Shrink("flood");
-							channel->Extend("flood",f);
-							channel->SetModeParam('f', parameter.c_str(), true);
-							return MODEACTION_ALLOW;
+							// mode params match
+							return MODEACTION_DENY;
+						}
+						else
+						{
+							if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
+							{
+								delete f;
+								floodsettings *f = new floodsettings(ban,nsecs,nlines);
+								channel->Shrink("flood");
+								channel->Extend("flood",f);
+								channel->SetModeParam('f', cur_param.c_str(), false);
+								channel->SetModeParam('f', parameter.c_str(), true);
+								return MODEACTION_ALLOW;
+							}
+							else
+							{
+								return MODEACTION_DENY;
+							}
 						}
 					}
 				}
@@ -169,7 +178,7 @@ class MsgFlood : public ModeHandler
 			else
 			{
 				source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
-				parameter = "";
+				parameter.clear();
 				return MODEACTION_DENY;
 			}
 		}
@@ -204,11 +213,11 @@ class ModuleMsgFlood : public Module
 			throw ModuleException("Could not add new modes!");
 	}
 	
-	void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
+	int ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
 	{
 		if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)
 		{
-			return;
+			return 0;
 		}
 
 		floodsettings *f;
@@ -241,25 +250,31 @@ class ModuleMsgFlood : public Module
 				}
 				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);
+				if (!dest->ServerKickUser(user, kickmessage, true))
+				{
+					delete dest;
+					return 1;
+				}
 			}
 		}
+		
+		return 0;
 	}
 
-	virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+	virtual int OnUserPreMessage(userrec *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
-		{
-			ProcessMessages(user,(chanrec*)dest,text);
-		}
+			return ProcessMessages(user,(chanrec*)dest,text);
+		
+		return 0;
 	}
 
-	virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+	virtual int OnUserPreNotice(userrec *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
-		{
-			ProcessMessages(user,(chanrec*)dest,text);
-		}
+			return ProcessMessages(user,(chanrec*)dest,text);
+			
+		return 0;
 	}
 
 	void OnChannelDelete(chanrec* chan)
@@ -274,7 +289,7 @@ class ModuleMsgFlood : public Module
 
 	void Implements(char* List)
 	{
-		List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
+		List[I_OnChannelDelete] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
 	}
 
 	virtual ~ModuleMsgFlood()
@@ -289,28 +304,4 @@ class ModuleMsgFlood : public Module
 	}
 };
 
-
-class ModuleMsgFloodFactory : public ModuleFactory
-{
- public:
-	ModuleMsgFloodFactory()
-	{
-	}
-	
-	~ModuleMsgFloodFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleMsgFlood(Me);
-	}
-	
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-	return new ModuleMsgFloodFactory;
-}
-
+MODULE_INIT(ModuleMsgFlood)