X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=2a022449f96d9e165684539262450dd2cf67146b;hb=b844d1cbbe79585facc69b9247baa8427cff0b62;hp=5300c6a4ffde9fa3cd3216a8361ae8abee21b89b;hpb=0465fd1da7a7504f31e0c96fa1b77190ec658c32;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 5300c6a4f..2a022449f 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -2,95 +2,146 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <time.h>
-#include <string>
-#ifdef GCC3
-#include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
-#include "modules.h"
-#include "dynamic.h"
-#include "wildcard.h"
-#include "message.h"
-#include "commands.h"
-#include "xline.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
 #include "cull_list.h"
 
-CullItem::CullItem(userrec* u, std::string r)
+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()
 {
-        this->user = u;
-        this->reason = r;
 }
 
 userrec* CullItem::GetUser()
 {
-        return this->user;
+	return this->user;
 }
 
-std::string CullItem::GetReason()
+std::string& CullItem::GetReason()
 {
-        return this->reason;
+	return this->reason;
 }
 
-CullList::CullList()
+CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
 	list.clear();
-        exempt.clear();
+	exempt.clear();
+}
+
+void CullList::AddItem(userrec* user, std::string &reason)
+{
+	AddItem(user, reason.c_str());
 }
 
-void CullList::AddItem(userrec* user, std::string reason)
+
+void CullList::AddItem(userrec* user, const char* reason)
 {
 	if (exempt.find(user) == exempt.end())
 	{
-	        CullItem item(user,reason);
-	        list.push_back(item);
-	        exempt[user] = 1;
+		CullItem item(user,reason);
+		list.push_back(item);
+		exempt[user] = user;
 	}
 }
 
 int CullList::Apply()
 {
-        int n = 0;
-        while (list.size())
-        {
-               std::vector<CullItem>::iterator a = list.begin();
-               userrec* u = a->GetUser();
-               std::string reason = a->GetReason();
-               kill_link(u,reason.c_str());
-               list.erase(list.begin());
-               n++;
-        }
-        return n;
+	int n = list.size();
+	while (list.size())
+	{
+		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());
+		std::string reason = a->GetReason();
+
+		if (reason.length() > MAXQUIT - 1)
+			reason.resize(MAXQUIT - 1);
+
+		if (a->GetUser()->registered != REG_ALL)
+			if (ServerInstance->unregistered_count)
+				ServerInstance->unregistered_count--;
+
+		if (IS_LOCAL(a->GetUser()))
+		{
+			a->GetUser()->Write("ERROR :Closing link (%s@%s) [%s]",a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+			if ((!a->GetUser()->sendq.empty()) && (!(*a->GetUser()->GetWriteError())))
+				a->GetUser()->FlushWriteBuf();
+		}
+
+		if (a->GetUser()->registered == REG_ALL)
+		{
+			a->GetUser()->PurgeEmptyChannels();
+			a->GetUser()->WriteCommonExcept("QUIT :%s",reason.c_str());
+			FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(a->GetUser(),reason));
+		}
+
+		FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(a->GetUser()));
+
+		if (IS_LOCAL(a->GetUser()))
+		{
+			if (ServerInstance->Config->GetIOHook(a->GetUser()->GetPort()))
+			{
+				try
+				{
+					ServerInstance->Config->GetIOHook(a->GetUser()->GetPort())->OnRawSocketClose(a->GetUser()->GetFd());
+				}
+				catch (CoreException& modexcept)
+				{
+					ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+				}
+			}
+
+			ServerInstance->SE->DelFd(a->GetUser());
+			a->GetUser()->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 (IS_LOCAL(a->GetUser()))
+				ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",a->GetUser()->nick,a->GetUser()->ident,a->GetUser()->host,reason.c_str());
+			else
+				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,reason.c_str());
+			a->GetUser()->AddToWhoWas();
+		}
+
+		if (iter != ServerInstance->clientlist->end())
+		{
+			if (IS_LOCAL(a->GetUser()))
+			{
+				std::vector<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),a->GetUser());
+				if (x != ServerInstance->local_users.end())
+					ServerInstance->local_users.erase(x);
+			}
+			ServerInstance->clientlist->erase(iter);
+			DELETE(a->GetUser());
+		}
+
+		list.erase(list.begin());
+		exempt.erase(exemptiter);
+	}
+	return n;
 }