X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=db9d4978e262f644b8c33e5819f7a54502be368a;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=b19054b0ddd562c20ebfe1dc1942de8c1c021bb3;hpb=74c8913f72e6d48c88a01155ef5fe5ca20cc2bb1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index b19054b0d..db9d4978e 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.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
@@ -11,89 +11,129 @@
  * ---------------------------------------------------
  */
 
+/* $Core: libIRCDcull_list */
+
 #include "inspircd.h"
-#include "users.h"
 #include "cull_list.h"
 
-/*
- * In current implementation of CullList, this isn't used. It did odd things with a lot of sockets.
- */
-bool CullList::IsValid(userrec* user)
-{
-	time_t esignon = 0;
-	std::map<userrec*,time_t>::iterator es = exempt.find(user);
-	if (es != exempt.end())
-		esignon = es->second;
-
-	for (user_hash::iterator u = ServerInstance->clientlist->begin(); u != ServerInstance->clientlist->end(); u++)
-	{
-		if (user == u->second)
-			return (u->second->signon == esignon);
-	}
-	return false;
-}
-
-CullItem::CullItem(userrec* u, std::string &r)
-{
-	this->user = u;
-	this->reason = r;
-}
-
-CullItem::CullItem(userrec* u, const char* r)
-{
-	this->user = u;
-	this->reason = r;
-}
-
-CullItem::~CullItem()
-{
-}
-
-userrec* CullItem::GetUser()
-{
-	return this->user;
-}
-
-std::string& CullItem::GetReason()
-{
-	return this->reason;
-}
-
 CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
 	list.clear();
-	exempt.clear();
 }
 
-void CullList::AddItem(userrec* user, std::string &reason)
+void CullList::AddItem(User* user)
 {
-	if (exempt.find(user) == exempt.end())
+	if (user->quitting)
 	{
-		CullItem item(user,reason);
-		list.push_back(item);
-		exempt[user] = user->signon;
+		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick);
+		return;
 	}
+
+	user->quitting = true;
+	list.push_back(user);
 }
 
-void CullList::AddItem(userrec* user, const char* reason)
+void CullList::MakeSilent(User* user)
 {
-	if (exempt.find(user) == exempt.end())
-	{
-		CullItem item(user,reason);
-		list.push_back(item);
-		exempt[user] = user->signon;
-	}
+	user->quietquit = true;
+	return;
 }
 
 int CullList::Apply()
 {
 	int n = list.size();
-	while (list.size())
+	int i = 0;
+
+	while (list.size() && i++ != 100)
 	{
-		std::vector<CullItem>::iterator a = list.begin();
+		std::vector<User *>::iterator a = list.begin();
+
+		User *u = (*a);
+		user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
+		const char* preset_reason = u->GetOperQuit();
+		std::string reason = u->quitmsg;
+		std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
+
+		if (reason.length() > MAXQUIT - 1)
+			reason.resize(MAXQUIT - 1);
+		if (oper_reason.length() > MAXQUIT - 1)
+			oper_reason.resize(MAXQUIT - 1);
+
+		if (u->registered != REG_ALL)
+			if (ServerInstance->Users->unregistered_count)
+				ServerInstance->Users->unregistered_count--;
 
-		userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str());
+		if (IS_LOCAL(u))
+		{
+			if ((!u->sendq.empty()) && (!(*u->GetWriteError())))
+				u->FlushWriteBuf();
+		}
+
+		if (u->registered == REG_ALL)
+		{
+			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(u));
+
+		if (IS_LOCAL(u))
+		{
+			if (u->io)
+			{
+				try
+				{
+					u->io->OnRawSocketClose(u->GetFd());
+				}
+				catch (CoreException& modexcept)
+				{
+					ServerInstance->Logs->Log("CULLLIST",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+				}
+			}
+
+			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 (u->registered == REG_ALL)
+		{
+			if (IS_LOCAL(u))
+			{
+				if (!u->quietquit)
+				{
+					ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",u->nick,u->ident,u->host,oper_reason.c_str());
+				}
+			}
+			else
+			{
+				if ((!ServerInstance->SilentULine(u->server)) && (!u->quietquit))
+				{
+					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());
+				}
+			}
+			u->AddToWhoWas();
+		}
+
+		if (iter != ServerInstance->Users->clientlist->end())
+		{
+			if (IS_LOCAL(u))
+			{
+				std::vector<User*>::iterator x = find(ServerInstance->Users->local_users.begin(),ServerInstance->Users->local_users.end(),u);
+				if (x != ServerInstance->Users->local_users.end())
+					ServerInstance->Users->local_users.erase(x);
+			}
+			ServerInstance->Users->clientlist->erase(iter);
+		}
+
+		delete u;
 		list.erase(list.begin());
 	}
+
 	return n;
 }
+