X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=22086375dd4333261f01dbc54aa00dd109df9314;hb=30b7a1bf7fb0b422a6fd674f0cce95b3b0f92673;hp=19a15decf27b6e632a5637712759b58ceac9ff50;hpb=da074814501f23680b579feb1ad649c86e8a1348;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index 19a15decf..22086375d 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDxline */
+/* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "bancache.h"
 
@@ -116,6 +115,22 @@ XLineLookup* XLineManager::GetAll(const std::string &type)
 	return &(n->second);
 }
 
+void XLineManager::DelAll(const std::string &type)
+{
+	ContainerIter n = lookup_lines.find(type);
+
+	if (n == lookup_lines.end())
+		return;
+
+	LookupIter x;
+
+	/* Delete all of a given type (this should probably use DelLine, but oh well) */
+	while ((x = n->second.begin()) != n->second.end())
+	{
+		ExpireLine(n, x);
+	}
+}
+
 std::vector<std::string> XLineManager::GetAllTypes()
 {
 	std::vector<std::string> items;
@@ -150,15 +165,30 @@ 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 the line exists, check if its an expired line */
+	ContainerIter x = lookup_lines.find(line->type);
+	if (x != lookup_lines.end())
+	{
+		LookupIter i = x->second.find(line->Displayable());
+		if (i != x->second.end())
+		{
+			if (i->second->duration && ServerInstance->Time() > i->second->expiry)
+				ExpireLine(x, i);
+			else
+				return false;
+		}
+	}
 
 	/*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
-	pending_lines.push_back(line);
+	XLineFactory* xlf = GetFactory(line->type);
+	if (!xlf)
+		return false;
+
+	if (xlf->AutoApplyToUserList(line))
+		pending_lines.push_back(line);
+
 	lookup_lines[line->type][line->Displayable()] = line;
 	line->OnAdd();
 
@@ -385,6 +415,18 @@ XLineManager::~XLineManager()
 	delete KFact;
 	delete QFact;
 	delete ZFact;
+
+	// Delete all existing XLines
+	for (XLineContainer::iterator i = lookup_lines.begin(); i != lookup_lines.end(); i++)
+	{
+		for (XLineLookup::iterator j = i->second.begin(); j != i->second.end(); j++)
+		{
+			delete j->second;
+		}
+		i->second.clear();
+	}
+	lookup_lines.clear();
+	
 }
 
 void XLine::Apply(User* u)
@@ -401,17 +443,21 @@ void XLine::DefaultApply(User* u, const std::string &line, bool bancache)
 	char sreason[MAXBUF];
 	snprintf(sreason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
 	if (*ServerInstance->Config->MoronBanner)
-		u->WriteServ("NOTICE %s :*** %s", u->nick, ServerInstance->Config->MoronBanner);
+		u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner);
+
 	if (ServerInstance->Config->HideBans)
-		User::QuitUser(ServerInstance, u, line + "-Lined", sreason);
+		ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
 	else
-		User::QuitUser(ServerInstance, u, sreason);
+		ServerInstance->Users->QuitUser(u, sreason);
 
 
 	if (bancache)
 	{
 		ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Adding positive hit (") + line + ") for " + u->GetIPString());
-		ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason);
+		if (this->duration > 0)
+			ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason, this->duration);
+		else
+			ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, line + "-Lined: " + this->reason);
 	}
 }
 
@@ -420,9 +466,10 @@ bool KLine::Matches(User *u)
 	if (u->exempt)
 		return false;
 
-	if ((match(u->ident, this->identmask)))
+	if (InspIRCd::Match(u->ident, this->identmask))
 	{
-		if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+		if (InspIRCd::MatchCIDR(u->host, this->hostmask) ||
+		    InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask))
 		{
 			return true;
 		}
@@ -441,9 +488,10 @@ bool GLine::Matches(User *u)
 	if (u->exempt)
 		return false;
 
-	if ((match(u->ident, this->identmask)))
+	if (InspIRCd::Match(u->ident, this->identmask))
 	{
-		if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+		if (InspIRCd::MatchCIDR(u->host, this->hostmask) ||
+		    InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask))
 		{
 			return true;
 		}
@@ -462,9 +510,10 @@ bool ELine::Matches(User *u)
 	if (u->exempt)
 		return false;
 
-	if ((match(u->ident, this->identmask)))
+	if (InspIRCd::Match(u->ident, this->identmask))
 	{
-		if ((match(u->host, this->hostmask, true)) || (match(u->GetIPString(), this->hostmask, true)))
+		if (InspIRCd::MatchCIDR(u->host, this->hostmask) ||
+		    InspIRCd::MatchCIDR(u->GetIPString(), this->hostmask))
 		{
 			return true;
 		}
@@ -478,7 +527,7 @@ 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;
@@ -492,10 +541,7 @@ void ZLine::Apply(User* u)
 
 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;
@@ -504,13 +550,13 @@ bool QLine::Matches(User *u)
 void QLine::Apply(User* u)
 {       
 	/* Force to uuid on apply of qline, no need to disconnect any more :) */
-	u->ForceNickChange(u->uuid);
+	u->ForceNickChange(u->uuid.c_str());
 }
 
 
 bool ZLine::Matches(const std::string &str)
 {
-	if (match(str.c_str(), this->ipaddr, true))
+	if (InspIRCd::MatchCIDR(str, this->ipaddr))
 		return true;
 	else
 		return false;
@@ -518,7 +564,7 @@ bool ZLine::Matches(const std::string &str)
 
 bool QLine::Matches(const std::string &str)
 {
-	if (match(str.c_str(), this->nick))
+	if (InspIRCd::Match(str, this->nick))
 		return true;
 
 	return false;
@@ -526,17 +572,17 @@ bool QLine::Matches(const std::string &str)
 
 bool ELine::Matches(const std::string &str)
 {
-	return ((match(str.c_str(), matchtext.c_str(), true)));
+	return (InspIRCd::MatchCIDR(str, matchtext));
 }
 
 bool KLine::Matches(const std::string &str)
 {
-	return ((match(str.c_str(), matchtext.c_str(), true)));
+	return (InspIRCd::MatchCIDR(str.c_str(), matchtext));
 }
 
 bool GLine::Matches(const std::string &str)
 {
-	return ((match(str.c_str(), matchtext.c_str(), true)));
+	return (InspIRCd::MatchCIDR(str, matchtext));
 }
 
 void ELine::OnAdd()
@@ -552,27 +598,27 @@ void ELine::OnAdd()
 
 void ELine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed E-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
 }
 
 void QLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %d seconds ago)",this->nick,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Q-Line %s (set by %s %ld seconds ago)",this->nick,this->source,this->duration);
 }
 
 void ZLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %d seconds ago)",this->ipaddr,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed Z-Line %s (set by %s %ld seconds ago)",this->ipaddr,this->source,this->duration);
 }
 
 void KLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed K-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
 }
 
 void GLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %d seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
+	ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed G-Line %s@%s (set by %s %ld seconds ago)",this->identmask,this->hostmask,this->source,this->duration);
 }
 
 const char* ELine::Displayable()