X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcull_list.cpp;h=a7f8d3316c6375d0ab396679fbb47632cbe54150;hb=5ca2a6ffdb4dbb7f7d8f120df5f99d85d484b3ab;hp=b3fd1c9e382f7eae279db9c2870c081a2eac72dd;hpb=dd98d56cabcd08a3d5207454e002b187af98d28a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cull_list.cpp b/src/cull_list.cpp
index b3fd1c9e3..a7f8d3316 100644
--- a/src/cull_list.cpp
+++ b/src/cull_list.cpp
@@ -25,7 +25,7 @@ void CullList::AddItem(User* user)
 {
 	if (user->quitting)
 	{
-		ServerInstance->Log(DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick);
+		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str());
 		return;
 	}
 
@@ -50,14 +50,12 @@ int CullList::Apply()
 
 		User *u = (*a);
 		user_hash::iterator iter = ServerInstance->Users->clientlist->find(u->nick);
-		const char* preset_reason = u->GetOperQuit();
-		std::string reason = u->operquitmsg;
-		std::string oper_reason = *preset_reason ? preset_reason : u->operquitmsg;
+		const std::string& preset_reason = u->GetOperQuit();
+		std::string reason;
+		std::string oper_reason;
 
-		if (reason.length() > MAXQUIT - 1)
-			reason.resize(MAXQUIT - 1);
-		if (oper_reason.length() > MAXQUIT - 1)
-			oper_reason.resize(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)
@@ -80,15 +78,15 @@ int CullList::Apply()
 
 		if (IS_LOCAL(u))
 		{
-			if (ServerInstance->Config->GetIOHook(u->GetPort()))
+			if (u->io)
 			{
 				try
 				{
-					ServerInstance->Config->GetIOHook(u->GetPort())->OnRawSocketClose(u->GetFd());
+					u->io->OnRawSocketClose(u->GetFd());
 				}
 				catch (CoreException& modexcept)
 				{
-					ServerInstance->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+					ServerInstance->Logs->Log("CULLLIST",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 				}
 			}
 
@@ -106,14 +104,14 @@ int CullList::Apply()
 			{
 				if (!u->quietquit)
 				{
-					ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",u->nick,u->ident,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,u->ident,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();
@@ -121,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;