Fix for crashbugs when quitting users as experienced by satmd, SiliconAI and others.

QA: Please test combinations of /quit, /kill, and friends.


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6595 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 1 insertions, 82 deletions

diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp
index 0c5db928d..2498d4209 100644
--- a/src/cmd_quit.cpp
+++ b/src/cmd_quit.cpp
@@ -26,88 +26,7 @@ extern "C" command_t* init_command(InspIRCd* Instance)
 
 CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user)
 {
-	user_hash::iterator iter = ServerInstance->clientlist->find(user->nick);
-	char reason[MAXBUF];
-	std::string quitmsg = "Client exited";
-
-	if (user->registered == REG_ALL)
-	{
-		/* theres more to do here, but for now just close the socket */
-		if (pcnt == 1)
-		{
-			if (*parameters[0] == ':')
-				parameters[0]++;
-
-			strlcpy(reason, parameters[0],MAXQUIT-1);
-
-			/* We should only prefix the quit for a local user. Remote users have
-			 * already been prefixed, where neccessary, by the upstream server.
-			 */
-			if (IS_LOCAL(user))
-			{
-				quitmsg = ServerInstance->Config->PrefixQuit;
-				quitmsg.append(parameters[0]);
-				user->Write("ERROR :Closing link (%s@%s) [%s]",user->ident,user->host,quitmsg.c_str());
-				ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",user->nick,user->ident,user->host,quitmsg.c_str());
-				user->WriteCommonExcept("QUIT :%s", quitmsg.c_str());
-			}
-			else
-			{
-				ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,parameters[0]);
-				user->WriteCommonExcept("QUIT :%s",parameters[0]);
-			}
-			FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,std::string(ServerInstance->Config->PrefixQuit)+std::string(parameters[0])));
-
-		}
-		else
-		{
-			if (IS_LOCAL(user))
-			{
-				user->Write("ERROR :Closing link (%s@%s) []",user->ident,user->host);
-				ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host);
-			}
-			else
-			{
-				ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [Client exited]",user->server,user->nick,user->ident,user->host);
-			}
-			user->WriteCommonExcept("QUIT :Client exited");
-			FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,"Client exited"));
-
-		}
-		user->AddToWhoWas();
-	}
-
-	FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
-
-	if (IS_LOCAL(user))
-	{
-		ServerInstance->SE->DelFd(user);
-		std::vector<userrec*>::iterator x = find(ServerInstance->local_users.begin(),ServerInstance->local_users.end(),user);
-		if (x != ServerInstance->local_users.end())
-			ServerInstance->local_users.erase(x);
-		user->CloseSocket();
-	}
-	
-	if (iter != ServerInstance->clientlist->end())
-	{
-		ServerInstance->clientlist->erase(iter);
-	}
-
-	if (user->registered == REG_ALL) {
-		user->PurgeEmptyChannels();
-	}
-
-	if (IS_LOCAL(user))
-	{
-		std::string original_command = "QUIT :" + quitmsg;
-		FOREACH_MOD(I_OnPostCommand,OnPostCommand("QUIT", parameters, pcnt, user, CMD_SUCCESS, original_command));
-	}
-
-	if (user->registered != REG_ALL)
-		if (ServerInstance->unregistered_count)
-			ServerInstance->unregistered_count--;
-
-	DELETE(user);
+	userrec::QuitUser(ServerInstance, user, pcnt ? parameters[0] : "Client exited");
 	return CMD_USER_DELETED;
 }