X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=8dd1f6ae142347b212cedcf401e34c717fca5972;hb=3593e33ce374caee9aec0575b49ec9b0001a8ec6;hp=f6ea2e0f1846fe925631b786e3f93ea04b294e52;hpb=821a5bca883ad8c06cb27963acf8861d9ef1031e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index f6ea2e0f1..8dd1f6ae1 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -11,14 +11,16 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDcull_list */
+
 #include "inspircd.h"
-#include "users.h"
 #include "cull_list.h"
 
-CullItem::CullItem(userrec* u, std::string &r, const char* o_reason)
+CullItem::CullItem(User* u, std::string &r, const char* o_reason)
 {
 	this->user = u;
 	this->reason = r;
+	this->silent = false;
 	/* Seperate oper reason not set, use the user reason */
 	if (*o_reason)
 		this->oper_reason = o_reason;
@@ -26,10 +28,11 @@ CullItem::CullItem(userrec* u, std::string &r, const char* o_reason)
 		this->oper_reason = r;
 }
 
-CullItem::CullItem(userrec* u, const char* r, const char* o_reason)
+CullItem::CullItem(User* u, const char* r, const char* o_reason)
 {
 	this->user = u;
 	this->reason = r;
+	this->silent = false;
 	/* Seperate oper reason not set, use the user reason */
 	if (*o_reason)
 		this->oper_reason = o_reason;
@@ -37,11 +40,21 @@ CullItem::CullItem(userrec* u, const char* r, const char* o_reason)
 		this->oper_reason = r;
 }
 
+void CullItem::MakeSilent()
+{
+	this->silent = true;
+}
+
+bool CullItem::IsSilent()
+{
+	return this->silent;
+}
+
 CullItem::~CullItem()
 {
 }
 
-userrec* CullItem::GetUser()
+User* CullItem::GetUser()
 {
 	return this->user;
 }
@@ -62,13 +75,13 @@ CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 	exempt.clear();
 }
 
-void CullList::AddItem(userrec* user, std::string &reason, const char* o_reason)
+void CullList::AddItem(User* user, std::string &reason, const char* o_reason)
 {
 	AddItem(user, reason.c_str(), o_reason);
 }
 
 
-void CullList::AddItem(userrec* user, const char* reason, const char* o_reason)
+void CullList::AddItem(User* user, const char* reason, const char* o_reason)
 {
 	if (exempt.find(user) == exempt.end())
 	{
@@ -78,6 +91,19 @@ void CullList::AddItem(userrec* user, const char* reason, const char* o_reason)
 	}
 }
 
+void CullList::MakeSilent(User* user)
+{
+	for (std::vector<CullItem>::iterator a = list.begin(); a != list.end(); ++a)
+	{
+		if (a->GetUser() == user)
+		{
+			a->MakeSilent();
+			break;
+		}
+	}
+	return;
+}
+
 int CullList::Apply()
 {
 	int n = list.size();
@@ -85,9 +111,10 @@ int CullList::Apply()
 	{
 		std::vector<CullItem>::iterator a = list.begin();
 
-		user_hash::iterator iter = ServerInstance->clientlist->find(a->GetUser()->nick);
-		std::map<userrec*, userrec*>::iterator exemptiter = exempt.find(a->GetUser());
-		const char* preset_reason = a->GetUser()->GetOperQuit();
+		User *u = a->GetUser();
+		user_hash::iterator iter = ServerInstance->clientlist->find(u->nick);
+		std::map<User*, User*>::iterator exemptiter = exempt.find(u);
+		const char* preset_reason = u->GetOperQuit();
 		std::string reason = a->GetReason();
 		std::string oper_reason = *preset_reason ? preset_reason : a->GetOperReason();
 
@@ -96,33 +123,32 @@ int CullList::Apply()
 		if (oper_reason.length() > MAXQUIT - 1)
 			oper_reason.resize(MAXQUIT - 1);
 
-		if (a->GetUser()->registered != REG_ALL)
+		if (u->registered != REG_ALL)
 			if (ServerInstance->unregistered_count)
 				ServerInstance->unregistered_count--;
 
-		if (IS_LOCAL(a->GetUser()))
+		if (IS_LOCAL(u))
 		{
-			a->GetUser()->Write("ERROR :Closing link (%s@%s) [%s]", a->GetUser()->ident, a->GetUser()->host, oper_reason.c_str());
-			if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError())))
-				a->GetUser()->FlushWriteBuf();
+			if ((!u->sendq.empty()) && (!(*u->GetWriteError())))
+				u->FlushWriteBuf();
 		}
 
-		if (a->GetUser()->registered == REG_ALL)
+		if (u->registered == REG_ALL)
 		{
-			a->GetUser()->PurgeEmptyChannels();
-			a->GetUser()->WriteCommonQuit(reason, oper_reason);
-			FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(), reason, oper_reason));
+			FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(u, reason, oper_reason));
+			u->PurgeEmptyChannels();
+			u->WriteCommonQuit(reason, oper_reason);
 		}
 
-		FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(a->GetUser()));
+		FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(u));
 
-		if (IS_LOCAL(a->GetUser()))
+		if (IS_LOCAL(u))
 		{
-			if (ServerInstance->Config->GetIOHook(a->GetUser()->GetPort()))
+			if (ServerInstance->Config->GetIOHook(u->GetPort()))
 			{
 				try
 				{
-					ServerInstance->Config->GetIOHook(a->GetUser()->GetPort())->OnRawSocketClose(a->GetUser()->GetFd());
+					ServerInstance->Config->GetIOHook(u->GetPort())->OnRawSocketClose(u->GetFd());
 				}
 				catch (CoreException& modexcept)
 				{
@@ -130,36 +156,43 @@ int CullList::Apply()
 				}
 			}
 
-			ServerInstance->SE->DelFd(a->GetUser());
-			a->GetUser()->CloseSocket();
+			ServerInstance->SE->DelFd(u);
+			u->CloseSocket();
 		}
 
 		/*
 		 * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
 		 * if they were an oper with +sn +qQ.
 		 */
-		if (a->GetUser()->registered == REG_ALL)
+		if (u->registered == REG_ALL)
 		{
-			if (IS_LOCAL(a->GetUser()))
-				ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str());
+			if (IS_LOCAL(u))
+			{
+				if (!a->IsSilent())
+				{
+					ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",u->nick,u->ident,u->host,oper_reason.c_str());
+				}
+			}
 			else
 			{
-				if (!ServerInstance->SilentULine(a->GetUser()->server))
-					ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",a->GetUser()->server,a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,oper_reason.c_str());
+				if ((!ServerInstance->SilentULine(u->server)) && (!a->IsSilent()))
+				{
+					ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",u->server,u->nick,u->ident,u->host,oper_reason.c_str());
+				}
 			}
-			a->GetUser()->AddToWhoWas();
+			u->AddToWhoWas();
 		}
 
 		if (iter != ServerInstance->clientlist->end())
 		{
-			if (IS_LOCAL(a->GetUser()))
+			if (IS_LOCAL(u))
 			{
-				std::vector<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),a->GetUser());
+				std::vector<User*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),u);
 				if (x != ServerInstance->local_users.end())
 					ServerInstance->local_users.erase(x);
 			}
 			ServerInstance->clientlist->erase(iter);
-			DELETE(a->GetUser());
+			delete u;
 		}
 
 		list.erase(list.begin());