X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_rline.cpp;h=c4439cbfba8b38b9f00b23b8666534a06c3c3e2b;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=06c852938b9f564101efdf5285a15af6882cc9b7;hpb=3af9c3f8950f864bcf9cdd56127cd4014827dece;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index 06c852938..c4439cbfb 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -23,11 +23,11 @@
 /* $ModDesc: RLINE: Regexp user banning. */
 
 #include "inspircd.h"
-#include "m_regex.h"
+#include "modules/regex.h"
 #include "xline.h"
 
 static bool ZlineOnMatch = false;
-static std::vector<ZLine *> background_zlines;
+static bool added_zline = false;
 
 class RLine : public XLine
 {
@@ -61,7 +61,8 @@ class RLine : public XLine
 
 	bool Matches(User *u)
 	{
-		if (u->exempt)
+		LocalUser* lu = IS_LOCAL(u);
+		if (lu && lu->exempt)
 			return false;
 
 		std::string compare = u->nick + "!" + u->ident + "@" + u->host + " " + u->fullname;
@@ -75,18 +76,22 @@ class RLine : public XLine
 
 	void Apply(User* u)
 	{
-		if (ZlineOnMatch) {
-			background_zlines.push_back(new ZLine(ServerInstance->Time(), duration ? expiry - ServerInstance->Time() : 0, ServerInstance->Config->ServerName.c_str(), reason.c_str(), u->GetIPString()));
+		if (ZlineOnMatch)
+		{
+			ZLine* zl = new ZLine(ServerInstance->Time(), duration ? expiry - ServerInstance->Time() : 0, ServerInstance->Config->ServerName.c_str(), reason.c_str(), u->GetIPString());
+			if (ServerInstance->XLines->AddLine(zl, NULL))
+			{
+				std::string timestr = ServerInstance->TimeString(zl->expiry);
+				ServerInstance->SNO->WriteToSnoMask('x', "Z-line added due to R-line match on *@%s%s%s: %s",
+					zl->ipaddr.c_str(), zl->duration ? " to expire on " : "", zl->duration ? timestr.c_str() : "", zl->reason.c_str());
+				added_zline = true;
+			}
+			else
+				delete zl;
 		}
 		DefaultApply(u, "R", false);
 	}
 
-	void DisplayExpiry()
-	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Removing expired R-line %s (set by %s %ld seconds ago)",
-			this->matchtext.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
-	}
-
 	const char* Displayable()
 	{
 		return matchtext.c_str();
@@ -107,7 +112,7 @@ class RLineFactory : public XLineFactory
 	RLineFactory(dynamic_reference<RegexFactory>& rx) : XLineFactory("R"), rxfactory(rx)
 	{
 	}
-	
+
 	/** Generate a RLine
 	 */
 	XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
@@ -120,10 +125,6 @@ class RLineFactory : public XLineFactory
 
 		return new RLine(set_time, duration, source, reason, xline_specific_mask, rxfactory);
 	}
-
-	~RLineFactory()
-	{
-	}
 };
 
 /** Handle /RLINE
@@ -147,7 +148,7 @@ class CommandRLine : public Command
 		{
 			// Adding - XXX todo make this respect <insane> tag perhaps..
 
-			long duration = ServerInstance->Duration(parameters[1]);
+			unsigned long duration = InspIRCd::Duration(parameters[1]);
 			XLine *r = NULL;
 
 			try
@@ -170,7 +171,8 @@ class CommandRLine : public Command
 					else
 					{
 						time_t c_requires_crap = duration + ServerInstance->Time();
-						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-line for %s to expire on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
+						std::string timestr = ServerInstance->TimeString(c_requires_crap);
+						ServerInstance->SNO->WriteToSnoMask('x', "%s added timed R-line for %s to expire on %s: %s", user->nick.c_str(), parameters[0].c_str(), timestr.c_str(), parameters[2].c_str());
 					}
 
 					ServerInstance->XLines->ApplyLines();
@@ -199,13 +201,15 @@ class CommandRLine : public Command
 
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
+		if (IS_LOCAL(user))
+			return ROUTE_LOCALONLY; // spanningtree will send ADDLINE
+
 		return ROUTE_BROADCAST;
 	}
 };
 
 class ModuleRLine : public Module
 {
- private:
 	dynamic_reference<RegexFactory> rxfactory;
 	RLineFactory f;
 	CommandRLine r;
@@ -220,11 +224,11 @@ class ModuleRLine : public Module
 	{
 		OnRehash(NULL);
 
-		ServerInstance->AddCommand(&r);
+		ServerInstance->Modules->AddService(r);
 		ServerInstance->XLines->RegisterFactory(&f);
 
 		Implementation eventlist[] = { I_OnUserConnect, I_OnRehash, I_OnUserPostNick, I_OnStats, I_OnBackgroundTimer };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual ~ModuleRLine()
@@ -252,14 +256,11 @@ class ModuleRLine : public Module
 
 	virtual void OnRehash(User *user)
 	{
-		ConfigReader Conf;
+		ConfigTag* tag = ServerInstance->Config->ConfValue("rline");
 
-		if (!Conf.ReadFlag("rline", "zlineonmatch", 0) && ZlineOnMatch)
-			background_zlines.clear();
-
-		MatchOnNickChange = Conf.ReadFlag("rline", "matchonnickchange", 0);
-		ZlineOnMatch = Conf.ReadFlag("rline", "zlineonmatch", 0);
-		std::string newrxengine = Conf.ReadValue("rline", "engine", 0);
+		MatchOnNickChange = tag->getBool("matchonnickchange");
+		ZlineOnMatch = tag->getBool("zlineonmatch");
+		std::string newrxengine = tag->getString("engine");
 
 		if (newrxengine.empty())
 			rxfactory.SetProvider("regex");
@@ -299,18 +300,11 @@ class ModuleRLine : public Module
 
 	virtual void OnBackgroundTimer(time_t curtime)
 	{
-		if (!ZlineOnMatch) return;
-		for (std::vector<ZLine *>::iterator i = background_zlines.begin(); i != background_zlines.end(); i++)
+		if (added_zline)
 		{
-			ZLine *zl = *i;
-			if (ServerInstance->XLines->AddLine(zl,NULL))
-			{
-				ServerInstance->SNO->WriteToSnoMask('x',"Z-line added due to R-line match on *@%s%s%s: %s", 
-					zl->ipaddr.c_str(), zl->duration ? " to expire on " : "", zl->duration ? ServerInstance->TimeString(zl->expiry).c_str() : "", zl->reason.c_str());
-				ServerInstance->XLines->ApplyLines();
-			}
+			added_zline = false;
+			ServerInstance->XLines->ApplyLines();
 		}
-		background_zlines.clear();
 	}
 
 };