X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_messageflood.cpp;h=5a40664d9b0f81c313e5408ff86bda5735ab8472;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=f2082da3338c27a23a7c12ecf729aaece1fde295;hpb=2dfc384cde46ba63ed7c2f4420712596096123ca;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index f2082da33..5a40664d9 100644
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -28,7 +28,7 @@ class floodsettings : public classbase
 	time_t reset;
 	std::map<User*,int> counters;
 
-	floodsettings(InspIRCd *Instance, bool a, int b, int c) : ServerInstance(Instance), ban(a), secs(b), lines(c)
+	floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
 	{
 		reset = ServerInstance->Time() + secs;
 	};
@@ -76,26 +76,22 @@ class floodsettings : public classbase
 class MsgFlood : public ModeHandler
 {
  public:
-	MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { }
+	SimpleExtItem<floodsettings> ext;
+	MsgFlood(Module* Creator) : ModeHandler(Creator, 'f', PARAM_SETONLY, MODETYPE_CHANNEL),
+		ext("messageflood", Creator) { }
 
 	ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
 	{
-		floodsettings* x;
-		if (channel->GetExt("flood",x))
+		floodsettings* x = ext.get(channel);
+		if (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, Channel* channel)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
-		/* When TS is equal, the alphabetically later one wins */
-		return (their_param < our_param);
-	}
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
-	{
-		floodsettings *f;
+		floodsettings *f = ext.get(channel);
 
 		if (adding)
 		{
@@ -138,12 +134,12 @@ class MsgFlood : public ModeHandler
 				}
 				else
 				{
-					if (!channel->GetExt("flood", f))
+					if (!f)
 					{
 						parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
-						floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines);
-						channel->Extend("flood",fs);
-						channel->SetMode('f', parameter);
+						f = new floodsettings(ban,nsecs,nlines);
+						ext.set(channel, f);
+						channel->SetModeParam('f', parameter);
 						return MODEACTION_ALLOW;
 					}
 					else
@@ -159,11 +155,9 @@ class MsgFlood : public ModeHandler
 						{
 							if ((((nlines != f->lines) || (nsecs != f->secs) || (ban != f->ban))) && (((nsecs > 0) && (nlines > 0))))
 							{
-								delete f;
-								floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines);
-								channel->Shrink("flood");
-								channel->Extend("flood",fs);
-								channel->SetMode('f', parameter);
+								floodsettings *fs = new floodsettings(ban,nsecs,nlines);
+								ext.set(channel, fs);
+								channel->SetModeParam('f', parameter);
 								return MODEACTION_ALLOW;
 							}
 							else
@@ -183,11 +177,10 @@ class MsgFlood : public ModeHandler
 		}
 		else
 		{
-			if (channel->GetExt("flood", f))
+			if (f)
 			{
-				delete f;
-				channel->Shrink("flood");
-				channel->SetMode('f', "");
+				ext.unset(channel);
+				channel->SetModeParam('f', "");
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -198,31 +191,29 @@ class MsgFlood : public ModeHandler
 
 class ModuleMsgFlood : public Module
 {
-
-	MsgFlood* mf;
+	MsgFlood mf;
 
  public:
 
-	ModuleMsgFlood(InspIRCd* Me)
-		: Module(Me)
+	ModuleMsgFlood()
+		: mf(this)
 	{
-
-		mf = new MsgFlood(ServerInstance);
-		if (!ServerInstance->Modes->AddMode(mf))
+		if (!ServerInstance->Modes->AddMode(&mf))
 			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNotice, I_OnUserPreMessage };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		Extensible::Register(&mf.ext);
+		Implementation eventlist[] = { I_OnUserPreNotice, I_OnUserPreMessage };
+		ServerInstance->Modules->Attach(eventlist, this, 2);
 	}
 
-	int ProcessMessages(User* user,Channel* dest, const std::string &text)
+	ModResult ProcessMessages(User* user,Channel* dest, const std::string &text)
 	{
-		if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP))
+		if (!IS_LOCAL(user) || (CHANOPS_EXEMPT('f') && dest->GetPrefixValue(user) == OP_VALUE))
 		{
-			return 0;
+			return MOD_RES_PASSTHRU;
 		}
 
-		floodsettings *f;
-		if (dest->GetExt("flood", f))
+		floodsettings *f = mf.ext.get(dest);
+		if (f)
 		{
 			f->addmessage(user);
 			if (f->shouldkick(user))
@@ -243,54 +234,42 @@ class ModuleMsgFlood : public Module
 				char kickmessage[MAXBUF];
 				snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
 
-				if (!dest->ServerKickUser(user, kickmessage, true))
+				if (!dest->ServerKickUser(user, kickmessage))
 				{
 					delete dest;
 				}
 
-				return 1;
+				return MOD_RES_DENY;
 			}
 		}
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	ModResult OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 			return ProcessMessages(user,(Channel*)dest,text);
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
+	ModResult OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
 	{
 		if (target_type == TYPE_CHANNEL)
 			return ProcessMessages(user,(Channel*)dest,text);
 
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	void OnChannelDelete(Channel* chan)
-	{
-		floodsettings* f;
-		if (chan->GetExt("flood", f))
-		{
-			delete f;
-			chan->Shrink("flood");
-		}
-	}
-
-
-	virtual ~ModuleMsgFlood()
+	~ModuleMsgFlood()
 	{
-		ServerInstance->Modes->DelMode(mf);
-		delete mf;
+		ServerInstance->Modes->DelMode(&mf);
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Provides channel mode +f (message flood protection)", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 };