1 files changed, 45 insertions, 108 deletions

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 63bcc38a4..edce2b22c 100644
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -23,35 +23,32 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides channel mode +j (join flood protection) */
-
 /** Holds settings and state associated with channel mode +j
  */
 class joinfloodsettings
 {
  public:
-	int secs;
-	int joins;
+	unsigned int secs;
+	unsigned int joins;
 	time_t reset;
 	time_t unlocktime;
-	int counter;
-	bool locked;
+	unsigned int counter;
 
-	joinfloodsettings(int b, int c) : secs(b), joins(c)
+	joinfloodsettings(unsigned int b, unsigned int c)
+		: secs(b), joins(c), unlocktime(0), counter(0)
 	{
 		reset = ServerInstance->Time() + secs;
-		counter = 0;
-		locked = false;
-	};
+	}
 
 	void addjoin()
 	{
-		counter++;
 		if (ServerInstance->Time() > reset)
 		{
-			counter = 0;
+			counter = 1;
 			reset = ServerInstance->Time() + secs;
 		}
+		else
+			counter++;
 	}
 
 	bool shouldlock()
@@ -66,27 +63,21 @@ class joinfloodsettings
 
 	bool islocked()
 	{
-		if (locked)
-		{
-			if (ServerInstance->Time() > unlocktime)
-			{
-				locked = false;
-				return false;
-			}
-			else
-			{
-				return true;
-			}
-		}
-		return false;
+		if (ServerInstance->Time() > unlocktime)
+			unlocktime = 0;
+
+		return (unlocktime != 0);
 	}
 
 	void lock()
 	{
-		locked = true;
 		unlocktime = ServerInstance->Time() + 60;
 	}
 
+	bool operator==(const joinfloodsettings& other) const
+	{
+		return ((this->secs == other.secs) && (this->joins == other.joins));
+	}
 };
 
 /** Handles channel mode +j
@@ -102,79 +93,39 @@ class JoinFlood : public ModeHandler
 	{
 		if (adding)
 		{
-			char ndata[MAXBUF];
-			char* data = ndata;
-			strlcpy(ndata,parameter.c_str(),MAXBUF);
-			char* joins = data;
-			char* secs = NULL;
-			while (*data)
+			std::string::size_type colon = parameter.find(':');
+			if ((colon == std::string::npos) || (parameter.find('-') != std::string::npos))
 			{
-				if (*data == ':')
-				{
-					*data = 0;
-					data++;
-					secs = data;
-					break;
-				}
-				else data++;
+				source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str());
+				return MODEACTION_DENY;
 			}
-			if (secs)
 
+			/* Set up the flood parameters for this channel */
+			unsigned int njoins = ConvToInt(parameter.substr(0, colon));
+			unsigned int nsecs = ConvToInt(parameter.substr(colon+1));
+			if ((njoins<1) || (nsecs<1))
 			{
-				/* Set up the flood parameters for this channel */
-				int njoins = atoi(joins);
-				int nsecs = atoi(secs);
-				if ((njoins<1) || (nsecs<1))
-				{
-					source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
-					parameter.clear();
-					return MODEACTION_DENY;
-				}
-				else
-				{
-					joinfloodsettings* f = ext.get(channel);
-					if (!f)
-					{
-						parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
-						f = new joinfloodsettings(nsecs, njoins);
-						ext.set(channel, f);
-						channel->SetModeParam('j', parameter);
-						return MODEACTION_ALLOW;
-					}
-					else
-					{
-						std::string cur_param = channel->GetModeParameter('j');
-						parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
-						if (cur_param == parameter)
-						{
-							// mode params match
-							return MODEACTION_DENY;
-						}
-						else
-						{
-							// new mode param, replace old with new
-							f = new joinfloodsettings(nsecs, njoins);
-							ext.set(channel, f);
-							channel->SetModeParam('j', parameter);
-							return MODEACTION_ALLOW;
-						}
-					}
-				}
-			}
-			else
-			{
-				source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
+				source->WriteNumeric(608, "%s :Invalid flood parameter",channel->name.c_str());
 				return MODEACTION_DENY;
 			}
+
+			joinfloodsettings jfs(nsecs, njoins);
+			joinfloodsettings* f = ext.get(channel);
+			if ((f) && (*f == jfs))
+				// mode params match
+				return MODEACTION_DENY;
+
+			ext.set(channel, jfs);
+			parameter = ConvToStr(njoins) + ":" + ConvToStr(nsecs);
+			return MODEACTION_ALLOW;
 		}
 		else
 		{
-			if (channel->IsModeSet('j'))
-			{
-				ext.unset(channel);
-				channel->SetModeParam('j', "");
-				return MODEACTION_ALLOW;
-			}
+			if (!channel->IsModeSet(this))
+				return MODEACTION_DENY;
+
+			ext.unset(channel);
+			return MODEACTION_ALLOW;
 		}
 		return MODEACTION_DENY;
 	}
@@ -182,39 +133,29 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-
 	JoinFlood jf;
 
  public:
-
 	ModuleJoinFlood()
 		: jf(this)
 	{
 	}
 
-	void init()
-	{
-		ServerInstance->Modules->AddService(jf);
-		ServerInstance->Modules->AddService(jf.ext);
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-	}
-
-	ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		if (chan)
 		{
 			joinfloodsettings *f = jf.ext.get(chan);
 			if (f && f->islocked())
 			{
-				user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
+				user->WriteNumeric(609, "%s :This channel is temporarily unavailable (+j). Please try again later.",chan->name.c_str());
 				return MOD_RES_DENY;
 			}
 		}
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
+	void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts) CXX11_OVERRIDE
 	{
 		/* We arent interested in JOIN events caused by a network burst */
 		if (sync)
@@ -235,11 +176,7 @@ class ModuleJoinFlood : public Module
 		}
 	}
 
-	~ModuleJoinFlood()
-	{
-	}
-
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides channel mode +j (join flood protection)", VF_VENDOR);
 	}