X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=a57f604c515df05cf3566d242053419c9f2ae1f2;hb=6eeecaada5818d8dc1f3bb98c3e0916d195e3592;hp=8843b99898908babdc5cecacfbc3fd025caf8315;hpb=6a869d0701bbfe3c7a5e370793adfda4b5b45c65;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index 8843b9989..a57f604c5 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -14,12 +14,11 @@
 /* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "bancache.h"
 
 /*
- * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and 
+ * This is now version 3 of the XLine subsystem, let's see if we can get it as nice and
  * efficient as we can this time so we can close this file and never ever touch it again ..
  *
  * Background:
@@ -166,12 +165,21 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
 
 bool XLineManager::AddLine(XLine* line, User* user)
 {
-	/*IdentHostPair ih = IdentSplit(hostmask);*/
-
 	ServerInstance->BanCache->RemoveEntries(line->type, false); // XXX perhaps remove ELines here?
 
-	if (DelLine(line->Displayable(), line->type, user, true))
-		return false;
+	if (line->duration && ServerInstance->Time() > line->expiry)
+		return false; // Don't apply expired XLines.
+
+	/* Don't apply duplicate xlines */
+	ContainerIter x = lookup_lines.find(line->type);
+	if (x != lookup_lines.end())
+	{
+		LookupIter i = x->second.find(line->Displayable());
+		if (i != x->second.end())
+		{
+			return false;
+		}
+	}
 
 	/*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
 	XLineFactory* xlf = GetFactory(line->type);
@@ -184,7 +192,7 @@ bool XLineManager::AddLine(XLine* line, User* user)
 	lookup_lines[line->type][line->Displayable()] = line;
 	line->OnAdd();
 
-	FOREACH_MOD(I_OnAddLine,OnAddLine(user, line));	
+	FOREACH_MOD(I_OnAddLine,OnAddLine(user, line));
 
 	return true;
 }
@@ -253,20 +261,17 @@ XLine* XLineManager::MatchesLine(const std::string &type, User* user)
 		safei = i;
 		safei++;
 
+		if (i->second->duration && current > i->second->expiry)
+		{
+			/* Expire the line, proceed to next one */
+			ExpireLine(x, i);
+			i = safei;
+			continue;
+		}
+
 		if (i->second->Matches(user))
 		{
-			if (i->second->duration && current > i->second->expiry)
-			{
-				/* Expire the line, return nothing */
-				ExpireLine(x, i);
-				/* Continue, there may be another that matches
-				 * (thanks aquanight)
-				 */
-				i = safei;
-				continue;
-			}
-			else
-				return i->second;
+			return i->second;
 		}
 
 		i = safei;
@@ -418,7 +423,7 @@ XLineManager::~XLineManager()
 		i->second.clear();
 	}
 	lookup_lines.clear();
-	
+
 }
 
 void XLine::Apply(User* u)
@@ -458,9 +463,10 @@ bool KLine::Matches(User *u)
 	if (u->exempt)
 		return false;
 
-	if ((match(u->ident, this->identmask)))
+	if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
 	{
-		if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+		if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+		    InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
 		{
 			return true;
 		}
@@ -479,9 +485,10 @@ bool GLine::Matches(User *u)
 	if (u->exempt)
 		return false;
 
-	if ((match(u->ident, this->identmask)))
+	if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
 	{
-		if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+		if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+		    InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
 		{
 			return true;
 		}
@@ -491,7 +498,7 @@ bool GLine::Matches(User *u)
 }
 
 void GLine::Apply(User* u)
-{       
+{
 	DefaultApply(u, "G", (strcmp(this->identmask, "*") == 0) ? true : false);
 }
 
@@ -500,9 +507,10 @@ bool ELine::Matches(User *u)
 	if (u->exempt)
 		return false;
 
-	if ((match(u->ident, this->identmask)))
+	if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
 	{
-		if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+		if (InspIRCd::MatchCIDR(u->host, this->hostmask, ascii_case_insensitive_map) ||
+		    InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask, ascii_case_insensitive_map))
 		{
 			return true;
 		}
@@ -516,31 +524,28 @@ bool ZLine::Matches(User *u)
 	if (u->exempt)
 		return false;
 
-	if (match(u->GetIPString(), this->ipaddr, true))
+	if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr))
 		return true;
 	else
 		return false;
 }
 
 void ZLine::Apply(User* u)
-{       
+{
 	DefaultApply(u, "Z", true);
 }
 
 
 bool QLine::Matches(User *u)
 {
-	if (u->exempt)
-		return false;
-
-	if (match(u->nick, this->nick))
+	if (InspIRCd::Match(u->nick, this->nick))
 		return true;
 
 	return false;
 }
 
 void QLine::Apply(User* u)
-{       
+{
 	/* Force to uuid on apply of qline, no need to disconnect any more :) */
 	u->ForceNickChange(u->uuid.c_str());
 }
@@ -548,7 +553,7 @@ void QLine::Apply(User* u)
 
 bool ZLine::Matches(const std::string &str)
 {
-	if (match(str, this->ipaddr, true))
+	if (InspIRCd::MatchCIDR(str, this->ipaddr))
 		return true;
 	else
 		return false;
@@ -556,7 +561,7 @@ bool ZLine::Matches(const std::string &str)
 
 bool QLine::Matches(const std::string &str)
 {
-	if (match(str, this->nick))
+	if (InspIRCd::Match(str, this->nick))
 		return true;
 
 	return false;
@@ -564,17 +569,17 @@ bool QLine::Matches(const std::string &str)
 
 bool ELine::Matches(const std::string &str)
 {
-	return ((match(str, matchtext, true)));
+	return (InspIRCd::MatchCIDR(str, matchtext));
 }
 
 bool KLine::Matches(const std::string &str)
 {
-	return ((match(str.c_str(), matchtext, true)));
+	return (InspIRCd::MatchCIDR(str.c_str(), matchtext));
 }
 
 bool GLine::Matches(const std::string &str)
 {
-	return ((match(str, matchtext, true)));
+	return (InspIRCd::MatchCIDR(str, matchtext));
 }
 
 void ELine::OnAdd()
@@ -590,27 +595,27 @@ void ELine::OnAdd()
 
 void ELine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,(long int)(ServerInstance->Time() - this->set_time));
 }
 
 void QLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,(long int)(ServerInstance->Time() - this->set_time));
 }
 
 void ZLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,(long int)(ServerInstance->Time() - this->set_time));
 }
 
 void KLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,(long int)(ServerInstance->Time() - this->set_time));
 }
 
 void GLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,(long int)(ServerInstance->Time() - this->set_time));
 }
 
 const char* ELine::Displayable()
@@ -676,4 +681,3 @@ XLineFactory* XLineManager::GetFactory(const std::string &type)
 
 	return n->second;
 }
-