X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=bfbe518cbbb0b781c09bd0f23979b03e5711a6a6;hb=30b7a1bf7fb0b422a6fd674f0cce95b3b0f92673;hp=26f3b4e43ec04964049cddf7185e5db051b39a0f;hpb=4b856bda135a08e800b96c970a10b0b6a34d433a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index 26f3b4e43..bfbe518cb 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDcull_list */
+/* $Core */
 
 #include "inspircd.h"
 #include "cull_list.h"
@@ -54,8 +54,8 @@ int CullList::Apply()
 		std::string reason;
 		std::string oper_reason;
 
-		reason.assign(u->quitmsg, 0, MAXQUIT - 1);
-		oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, MAXQUIT - 1);
+		reason.assign(u->quitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
+		oper_reason.assign(preset_reason.empty() ? preset_reason : u->operquitmsg, 0, ServerInstance->Config->Limits.MaxQuit);
 
 		if (u->registered != REG_ALL)
 			if (ServerInstance->Users->unregistered_count)
@@ -63,7 +63,7 @@ int CullList::Apply()
 
 		if (IS_LOCAL(u))
 		{
-			if ((!u->sendq.empty()) && (!(*u->GetWriteError())))
+			if (!u->sendq.empty())
 				u->FlushWriteBuf();
 		}
 
@@ -78,11 +78,11 @@ int CullList::Apply()
 
 		if (IS_LOCAL(u))
 		{
-			if (u->io)
+			if (u->GetIOHook())
 			{
 				try
 				{
-					u->io->OnRawSocketClose(u->GetFd());
+					u->GetIOHook()->OnRawSocketClose(u->GetFd());
 				}
 				catch (CoreException& modexcept)
 				{
@@ -104,14 +104,14 @@ int CullList::Apply()
 			{
 				if (!u->quietquit)
 				{
-					ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",u->nick.c_str(),u->ident.c_str(),u->host,oper_reason.c_str());
+					ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]", u->nick.c_str(), u->ident.c_str(), u->host.c_str(), 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.c_str(),u->ident.c_str(),u->host,oper_reason.c_str());
+					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(), oper_reason.c_str());
 				}
 			}
 			u->AddToWhoWas();
@@ -119,13 +119,22 @@ int CullList::Apply()
 
 		if (iter != ServerInstance->Users->clientlist->end())
 		{
-			if (IS_LOCAL(u))
+			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
 			{
-				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->Logs->Log("CULLLIST", DEBUG, "Failed to remove user from vector..");
 			}
-			ServerInstance->Users->clientlist->erase(iter);
 		}
 
 		delete u;