X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fxline.cpp;h=63a64d6b9d74d2b9ab73a4e38c8702f37b3c990b;hb=d736eba00b274c87662bd73a3acf8288135643d6;hp=12948959b9b0ebb95fcc4aa09532c13be525dfbc;hpb=2d2e0469b8ac7c64c9dc22f7074db8fc245e2f13;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/xline.cpp b/src/xline.cpp
index 12948959b..63a64d6b9 100644
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -156,9 +156,9 @@ void XLineManager::CheckELines()
 	if (ELines.empty())
 		return;
 
-	for (std::vector<LocalUser*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+	for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
 	{
-		User* u = (User*)(*u2);
+		LocalUser* u = *u2;
 
 		/* This uses safe iteration to ensure that if a line expires here, it doenst trash the iterator */
 		LookupIter safei;
@@ -259,10 +259,15 @@ bool XLineManager::AddLine(XLine* line, User* user)
 	ContainerIter x = lookup_lines.find(line->type);
 	if (x != lookup_lines.end())
 	{
-		LookupIter i = x->second.find(line->Displayable());
+		LookupIter i = x->second.find(line->Displayable().c_str());
 		if (i != x->second.end())
 		{
-			return false;
+			// XLine propagation bug was here, if the line to be added already exists and
+			// it's expired then expire it and add the new one instead of returning false
+			if ((!i->second->duration) || (ServerInstance->Time() < i->second->expiry))
+				return false;
+
+			ExpireLine(x, i);
 		}
 	}
 
@@ -276,10 +281,10 @@ bool XLineManager::AddLine(XLine* line, User* user)
 	if (xlf->AutoApplyToUserList(line))
 		pending_lines.push_back(line);
 
-	lookup_lines[line->type][line->Displayable()] = line;
+	lookup_lines[line->type][line->Displayable().c_str()] = line;
 	line->OnAdd();
 
-	FOREACH_MOD(I_OnAddLine,OnAddLine(user, line));
+	FOREACH_MOD(OnAddLine, (user, line));
 
 	return true;
 }
@@ -303,7 +308,7 @@ bool XLineManager::DelLine(const char* hostmask, const std::string &type, User*
 
 	ServerInstance->BanCache->RemoveEntries(y->second->type, true);
 
-	FOREACH_MOD(I_OnDelLine,OnDelLine(user, y->second));
+	FOREACH_MOD(OnDelLine, (user, y->second));
 
 	y->second->Unset();
 
@@ -321,9 +326,9 @@ 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<LocalUser*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+	for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
 	{
-		User* u = (User*)(*u2);
+		LocalUser* u = *u2;
 		u->exempt = false;
 	}
 
@@ -404,7 +409,7 @@ XLine* XLineManager::MatchesLine(const std::string &type, const std::string &pat
 // removes lines that have expired
 void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
 {
-	FOREACH_MOD(I_OnExpireLine, OnExpireLine(item->second));
+	FOREACH_MOD(OnExpireLine, (item->second));
 
 	item->second->DisplayExpiry();
 	item->second->Unset();
@@ -425,10 +430,10 @@ void XLineManager::ExpireLine(ContainerIter container, LookupIter item)
 // applies lines, removing clients and changing nicks etc as applicable
 void XLineManager::ApplyLines()
 {
-	std::vector<LocalUser*>::reverse_iterator u2 = ServerInstance->Users->local_users.rbegin();
+	LocalUserList::reverse_iterator u2 = ServerInstance->Users->local_users.rbegin();
 	while (u2 != ServerInstance->Users->local_users.rend())
 	{
-		User* u = *u2++;
+		LocalUser* u = *u2++;
 
 		// Don't ban people who are exempt.
 		if (u->exempt)
@@ -526,30 +531,28 @@ bool XLine::IsBurstable()
 
 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.c_str());
-	if (!ServerInstance->Config->MoronBanner.empty())
-		u->WriteServ("NOTICE %s :*** %s", u->nick.c_str(), ServerInstance->Config->MoronBanner.c_str());
+	const std::string banReason = line + "-Lined: " + reason;
+
+	if (!ServerInstance->Config->XLineMessage.empty())
+		u->WriteNotice("*** " + ServerInstance->Config->XLineMessage);
 
 	if (ServerInstance->Config->HideBans)
-		ServerInstance->Users->QuitUser(u, line + "-Lined", sreason);
+		ServerInstance->Users->QuitUser(u, line + "-Lined", &banReason);
 	else
-		ServerInstance->Users->QuitUser(u, sreason);
+		ServerInstance->Users->QuitUser(u, banReason);
 
 
 	if (bancache)
 	{
-		ServerInstance->Logs->Log("BANCACHE", DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString());
-		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);
+		ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Adding positive hit (" + line + ") for " + u->GetIPString());
+		ServerInstance->BanCache->AddHit(u->GetIPString(), this->type, banReason, this->duration);
 	}
 }
 
 bool KLine::Matches(User *u)
 {
-	if (u->exempt)
+	LocalUser* lu = IS_LOCAL(u);
+	if (lu && lu->exempt)
 		return false;
 
 	if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
@@ -571,7 +574,8 @@ void KLine::Apply(User* u)
 
 bool GLine::Matches(User *u)
 {
-	if (u->exempt)
+	LocalUser* lu = IS_LOCAL(u);
+	if (lu && lu->exempt)
 		return false;
 
 	if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
@@ -593,7 +597,8 @@ void GLine::Apply(User* u)
 
 bool ELine::Matches(User *u)
 {
-	if (u->exempt)
+	LocalUser* lu = IS_LOCAL(u);
+	if (lu && lu->exempt)
 		return false;
 
 	if (InspIRCd::Match(u->ident, this->identmask, ascii_case_insensitive_map))
@@ -610,7 +615,8 @@ bool ELine::Matches(User *u)
 
 bool ZLine::Matches(User *u)
 {
-	if (u->exempt)
+	LocalUser* lu = IS_LOCAL(u);
+	if (lu && lu->exempt)
 		return false;
 
 	if (InspIRCd::MatchCIDR(u->GetIPString(), this->ipaddr))
@@ -636,7 +642,7 @@ 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.c_str());
+	u->ForceNickChange(u->uuid);
 }
 
 
@@ -674,67 +680,44 @@ bool GLine::Matches(const std::string &str)
 void ELine::OnAdd()
 {
 	/* When adding one eline, only check the one eline */
-	for (std::vector<LocalUser*>::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
+	for (LocalUserList::const_iterator u2 = ServerInstance->Users->local_users.begin(); u2 != ServerInstance->Users->local_users.end(); u2++)
 	{
-		User* u = (User*)(*u2);
+		LocalUser* u = *u2;
 		if (this->Matches(u))
 			u->exempt = true;
 	}
 }
 
-void ELine::DisplayExpiry()
-{
-	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired E-Line %s@%s (set by %s %ld seconds ago)",
-		identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
-}
-
-void QLine::DisplayExpiry()
-{
-	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Q-Line %s (set by %s %ld seconds ago)",
-		nick.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
-}
-
-void ZLine::DisplayExpiry()
-{
-	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired Z-Line %s (set by %s %ld seconds ago)",
-		ipaddr.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
-}
-
-void KLine::DisplayExpiry()
-{
-	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired K-Line %s@%s (set by %s %ld seconds ago)",
-		identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
-}
-
-void GLine::DisplayExpiry()
+void XLine::DisplayExpiry()
 {
-	ServerInstance->SNO->WriteToSnoMask('x',"Removing expired G-Line %s@%s (set by %s %ld seconds ago)",
-		identmask.c_str(),hostmask.c_str(),source.c_str(),(long)(ServerInstance->Time() - this->set_time));
+	bool onechar = (type.length() == 1);
+	ServerInstance->SNO->WriteToSnoMask('x', "Removing expired %s%s %s (set by %s %ld seconds ago)",
+		type.c_str(), (onechar ? "-Line" : ""), Displayable().c_str(), source.c_str(), (long)(ServerInstance->Time() - set_time));
 }
 
-const char* ELine::Displayable()
+const std::string& ELine::Displayable()
 {
-	return matchtext.c_str();
+	return matchtext;
 }
 
-const char* KLine::Displayable()
+const std::string& KLine::Displayable()
 {
-	return matchtext.c_str();
+	return matchtext;
 }
 
-const char* GLine::Displayable()
+const std::string& GLine::Displayable()
 {
-	return matchtext.c_str();
+	return matchtext;
 }
 
-const char* ZLine::Displayable()
+const std::string& ZLine::Displayable()
 {
-	return ipaddr.c_str();
+	return ipaddr;
 }
 
-const char* QLine::Displayable()
+const std::string& QLine::Displayable()
 {
-	return nick.c_str();
+	return nick;
 }
 
 bool KLine::IsBurstable()