X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=3f0ddbf2b14104ae6f34db8d7c957a96454f93a6;hb=89fc6ca9c66198fe54cce19d59279cd454fc1bd0;hp=56bd029d7a754b8fefb9f9b3dd8ef1daa35c4d00;hpb=85a79e990de2b1c05a161ea49857a9586567b8c2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index 56bd029d7..3f0ddbf2b 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -16,6 +16,7 @@
 #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 
@@ -69,7 +70,7 @@ void XLineManager::CheckELines()
 	if (ELines.empty())
 		return;
 
-	for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+	for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
 	{
 		User* u = (User*)(*u2);
 
@@ -138,6 +139,7 @@ IdentHostPair XLineManager::IdentSplit(const std::string &ident_and_host)
 	}
 	else
 	{
+		n.first = "";
 		n.second = ident_and_host;
 	}
 
@@ -150,6 +152,8 @@ 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;
 
@@ -180,6 +184,8 @@ bool XLineManager::DelLine(const char* hostmask, const std::string &type, User*
 	if (simulate)
 		return true;
 
+	ServerInstance->BanCache->RemoveEntries(y->second->type, true);
+
 	FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second));
 
 	y->second->Unset();
@@ -198,7 +204,7 @@ bool XLineManager::DelLine(const char* hostmask, const std::string &type, User*
 void ELine::Unset()
 {
 	/* remove exempt from everyone and force recheck after deleting eline */
-	for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+	for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
 	{
 		User* u = (User*)(*u2);
 		u->exempt = false;
@@ -284,26 +290,28 @@ XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pat
 // removes lines that have expired
 void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
 {
-		item->second->DisplayExpiry();
-		item->second->Unset();
+	FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second));
+
+	item->second->DisplayExpiry();
+	item->second->Unset();
 
-		/* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line
-		 * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending?
-		 * -- Brain
-		 */
-		std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second);
-		if (pptr != pending_lines.end())
-			pending_lines.erase(pptr);
+	/* TODO: Can we skip this loop by having a 'pending' field in the XLine class, which is set when a line
+	 * is pending, cleared when it is no longer pending, so we skip over this loop if its not pending?
+	 * -- Brain
+	 */
+	std::vector<XLine*>::iterator pptr = std::find(pending_lines.begin(), pending_lines.end(), item->second);
+	if (pptr != pending_lines.end())
+		pending_lines.erase(pptr);
 
-		delete item->second;
-		container->second.erase(item);
+	delete item->second;
+	container->second.erase(item);
 }
 
 
 // applies lines, removing clients and changing nicks etc as applicable
 void XLineManager::ApplyLines()
 {
-	for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+	for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
 	{
 		User* u = (User*)(*u2);
 
@@ -383,16 +391,28 @@ void XLine::Apply(User* u)
 {
 }
 
-void XLine::DefaultApply(User* u, const std::string &line)
+bool XLine::IsBurstable()
 {
-	char reason[MAXBUF];
-	snprintf(reason, MAXBUF, "%s-Lined: %s", line.c_str(), this->reason);
+	return true;
+}
+
+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);
 	if (ServerInstance->Config->HideBans)
-		User::QuitUser(ServerInstance, u, line + "-Lined", reason);
+		User::QuitUser(ServerInstance, u, line + "-Lined", sreason);
 	else
-		User::QuitUser(ServerInstance, u, reason);
+		User::QuitUser(ServerInstance, 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);
+	}
 }
 
 bool KLine::Matches(User *u)
@@ -413,7 +433,7 @@ bool KLine::Matches(User *u)
 
 void KLine::Apply(User* u)
 {
-	DefaultApply(u, "K");
+	DefaultApply(u, "K", (strcmp(this->identmask, "*") == 0) ? true : false);
 }
 
 bool GLine::Matches(User *u)
@@ -434,7 +454,7 @@ bool GLine::Matches(User *u)
 
 void GLine::Apply(User* u)
 {       
-	DefaultApply(u, "G");
+	DefaultApply(u, "G", (strcmp(this->identmask, "*") == 0) ? true : false);
 }
 
 bool ELine::Matches(User *u)
@@ -466,7 +486,7 @@ bool ZLine::Matches(User *u)
 
 void ZLine::Apply(User* u)
 {       
-	DefaultApply(u, "Z");
+	DefaultApply(u, "Z", true);
 }
 
 
@@ -522,7 +542,7 @@ bool GLine::Matches(const std::string &str)
 void ELine::OnAdd()
 {
 	/* When adding one eline, only check the one eline */
-	for (std::vector<User*>::const_iterator u2 = ServerInstance->local_users.begin(); u2 != ServerInstance->local_users.end(); u2++)
+	for (std::vector<User*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
 	{
 		User* u = (User*)(*u2);
 		if (this->Matches(u))
@@ -532,27 +552,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()
@@ -580,6 +600,11 @@ const char* QLine::Displayable()
 	return nick;
 }
 
+bool KLine::IsBurstable()
+{
+	return false;
+}
+
 bool XLineManager::RegisterFactory(XLineFactory* xlf)
 {
 	XLineFactMap::iterator n = line_factory.find(xlf->GetType());
@@ -608,7 +633,7 @@ XLineFactory* XLineManager::GetFactory(const std::string &type)
 {
 	XLineFactMap::iterator n = line_factory.find(type);
 
-	if (n != line_factory.end())
+	if (n == line_factory.end())
 		return NULL;
 
 	return n->second;