X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=07649ed819b173240c1563bb107e7273506295ec;hb=90ea385688339d21861166d7de840fc0494edcdb;hp=628c80019befa13a8fd5ec80fcb534d2c223b76f;hpb=1552f3918ac0dad7fef9b86b70c0f4a63d4e37a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 628c80019..07649ed81 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,103 +11,104 @@
  * ---------------------------------------------------
  */
 
+/* $Core */
+
 #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)
+CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
 {
-	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++)
-	{
-		/*
-		 * BUGFIX
-		 *
-		 * Because there is an undetermined period of time between a user existing,
-		 * and this function being called, we have to check for the following condition:
-		 *
-		 * Between CullList::AddItem(u) being called, and CullList::IsValid(u) being called,
-		 * the user with the pointer u has quit, but only to be REPLACED WITH A NEW USER WHO
-		 * BECAUSE OF ALLOCATION RULES, HAS THE SAME MEMORY ADDRESS! To prevent this, we
-		 * cross reference each pointer to the user's signon time, and if the signon times
-		 * do not match, we return false here to indicate this user is NOT valid as it
-		 * seems to differ from the pointer snapshot we got a few seconds earlier. Should
-		 * prevent a few random crashes during netsplits.
-		 */
-		if (user == u->second)
-			return (u->second->signon == esignon);
-	}
-	return false;
 }
 
-CullItem::CullItem(userrec* u, std::string &r)
+void CullList::AddItem(User* user)
 {
-	this->user = u;
-	this->reason = r;
+	list.push_back(user);
 }
 
-CullItem::CullItem(userrec* u, const char* r)
+void CullList::MakeSilent(User* user)
 {
-	this->user = u;
-	this->reason = r;
+	user->quietquit = true;
+	return;
 }
 
-CullItem::~CullItem()
+void CullList::Apply()
 {
-}
+	for(std::vector<User *>::iterator a = list.begin(); a != list.end(); a++)
+	{
+		User *u = *a;
+		// user has been moved onto their UID; that's why this isn't find(u->nick)
+		user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->uuid);
 
-userrec* CullItem::GetUser()
-{
-	return this->user;
-}
+		if (u->registered != REG_ALL)
+			if (ServerInstance->Users->unregistered_count)
+				ServerInstance->Users->unregistered_count--;
 
-std::string& CullItem::GetReason()
-{
-	return this->reason;
-}
+		if (IS_LOCAL(u))
+		{
+			if (!u->sendq.empty())
+				u->FlushWriteBuf();
 
-CullList::CullList(InspIRCd* Instance) : ServerInstance(Instance)
-{
-	list.clear();
-	exempt.clear();
-}
+			if (u->GetIOHook())
+			{
+				try
+				{
+					u->GetIOHook()->OnRawSocketClose(u->GetFd());
+				}
+				catch (CoreException& modexcept)
+				{
+					ServerInstance->Logs->Log("CULLLIST",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+				}
+			}
 
-void CullList::AddItem(userrec* user, std::string &reason)
-{
-	if (exempt.find(user) == exempt.end())
-	{
-		CullItem item(user,reason);
-		list.push_back(item);
-		exempt[user] = user->signon;
-	}
-}
+			ServerInstance->SE->DelFd(u);
+			u->CloseSocket();
+		}
 
-void CullList::AddItem(userrec* user, const char* reason)
-{
-	if (exempt.find(user) == exempt.end())
-	{
-		CullItem item(user,reason);
-		list.push_back(item);
-		exempt[user] = user->signon;
-	}
-}
+		/*
+		 * 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.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.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.c_str(), u->ident.c_str(), u->host.c_str(), u->operquitmsg.c_str());
+				}
+			}
+			u->AddToWhoWas();
+		}
 
-int CullList::Apply()
-{
-	int n = list.size();
-	while (list.size())
-	{
-		std::vector<CullItem>::iterator a = list.begin();
+		if (iter != ServerInstance->Users->clientlist->end())
+		{
+			ServerInstance->Users->clientlist->erase(iter);
+		}
+		else
+		{
+			ServerInstance->Logs->Log("CULLLIST", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
+		}
+
+		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);
+			else
+			{
+				ServerInstance->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector..");
+			}
+		}
 
-		userrec::QuitUser(ServerInstance, a->GetUser(), a->GetReason().c_str());
-		list.erase(list.begin());
+		delete u;
 	}
-	return n;
+	list.clear();
 }
+