X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=52174792f53f45cc0ffb29e7f0e2a7c4a55780ee;hb=3a7dd5b129450b94e0a87b8ad5009da70905b8e5;hp=b41c71da99aa26ffac24de29bbed01ddac0aefb7;hpb=3eefd1dfbdf611e526670b89dbd738e17c392c2c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index b41c71da9..52174792f 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -21,11 +21,13 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +f (message flood protection) */
 
-class floodsettings
+/** Holds flood settings and state for mode +f
+ */
+class floodsettings : public classbase
 {
  public:
 	bool ban;
@@ -38,7 +40,6 @@ class floodsettings
 	floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
 	{
 		reset = time(NULL) + secs;
-		log(DEBUG,"Create new floodsettings: %lu %lu",time(NULL),reset);
 	};
 
 	void addmessage(userrec* who)
@@ -47,16 +48,13 @@ class floodsettings
 		if (iter != counters.end())
 		{
 			iter->second++;
-			log(DEBUG,"Count for %s is now %d",who->nick,iter->second);
 		}
 		else
 		{
 			counters[who] = 1;
-			log(DEBUG,"Count for %s is now *1*",who->nick);
 		}
 		if (time(NULL) > reset)
 		{
-			log(DEBUG,"floodsettings timer Resetting.");
 			counters.clear();
 			reset = time(NULL) + secs;
 		}
@@ -67,7 +65,6 @@ class floodsettings
 		std::map<userrec*,int>::iterator iter = counters.find(who);
 		if (iter != counters.end())
 		{
-			log(DEBUG,"should kick? %d, %d",iter->second,this->lines);
 			return (iter->second >= this->lines);
 		}
 		else return false;
@@ -83,10 +80,27 @@ class floodsettings
 	}
 };
 
+/** Handles channel mode +f
+ */
 class MsgFlood : public ModeHandler
 {
  public:
-	MsgFlood() : ModeHandler('f', 1, 0, false, MODETYPE_CHANNEL, false) { }
+	MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { }
+
+        ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+        {
+		floodsettings* 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);
+        }
+
+	bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+	{
+		/* When TS is equal, the alphabetically later one wins */
+		return (their_param < our_param);
+	}
 
 	ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
 	{
@@ -127,7 +141,7 @@ class MsgFlood : public ModeHandler
 				int nsecs = atoi(secs);
 				if ((nlines<1) || (nsecs<1))
 				{
-					WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name);
+					source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
 					parameter = "";
 					return MODEACTION_DENY;
 				}
@@ -142,11 +156,24 @@ class MsgFlood : public ModeHandler
 						channel->SetModeParam('f', parameter.c_str(), true);
 						return MODEACTION_ALLOW;
 					}
+					else
+					{
+						if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)))
+						{
+							delete f;
+							floodsettings *f = new floodsettings(ban,nsecs,nlines);
+							parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+							channel->Shrink("flood");
+							channel->Extend("flood",f);
+							channel->SetModeParam('f', parameter.c_str(), true);
+							return MODEACTION_ALLOW;
+						}
+					}
 				}
 			}
 			else
 			{
-				WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name);
+				source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
 				parameter = "";
 				return MODEACTION_DENY;
 			}
@@ -168,17 +195,17 @@ class MsgFlood : public ModeHandler
 
 class ModuleMsgFlood : public Module
 {
-	Server *Srv;
+	
 	MsgFlood* mf;
 	
  public:
  
-	ModuleMsgFlood(Server* Me)
+	ModuleMsgFlood(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
-		mf = new MsgFlood();
-		Srv->AddMode(mf, 'f');
+		
+		mf = new MsgFlood(ServerInstance);
+		ServerInstance->AddMode(mf, 'f');
 	}
 	
 	void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
@@ -195,12 +222,12 @@ class ModuleMsgFlood : public Module
 					f->clear(user);
 					if (f->ban)
 					{
-						char* parameters[3];
+						const char* parameters[3];
 						parameters[0] = dest->name;
 						parameters[1] = "+b";
 						parameters[2] = user->MakeWildHost();
-						Srv->SendMode(parameters,3,user);
-                                                std::deque<std::string> n;
+						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
@@ -211,9 +238,9 @@ class ModuleMsgFlood : public Module
 						n.push_back("+b");
 						n.push_back(user->MakeWildHost());
 						Event rmode((char *)&n, NULL, "send_mode");
-						rmode.Send();
+						rmode.Send(ServerInstance);
 					}
-					Srv->KickUser(NULL, user, dest, "Channel flood triggered (mode +f)");
+					dest->ServerKickUser(user, "Channel flood triggered (mode +f)", true);
 				}
 			}
 		}
@@ -247,22 +274,18 @@ class ModuleMsgFlood : public Module
 
 	void Implements(char* List)
 	{
-		List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
-	}
-
-	virtual void On005Numeric(std::string &output)
-	{
-		InsertMode(output, "f", 3);
+		List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
 	}
 
 	virtual ~ModuleMsgFlood()
 	{
+		ServerInstance->Modes->DelMode(mf);
 		DELETE(mf);
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1, 0, 0, 0, VF_COMMON | VF_VENDOR);
 	}
 };
 
@@ -278,7 +301,7 @@ class ModuleMsgFloodFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleMsgFlood(Me);
 	}