X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_quit.cpp;h=a859c179017d6b0b4e8ecfd98ad9f66b7624ab2b;hb=107595610061e05871094ef6161a287c1dd53737;hp=dfa33e91cdf8b5af50abb8c669bf14d2aba8cf3e;hpb=95840640cb374a0845c866bd1ad56a04dd833081;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_quit.cpp b/src/cmd_quit.cpp index dfa33e91c..a859c1790 100644 --- a/src/cmd_quit.cpp +++ b/src/cmd_quit.cpp @@ -2,117 +2,47 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * 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. * * --------------------------------------------------- */ -#include "inspircd_config.h" #include "inspircd.h" #include "configreader.h" -#include -#include #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 "mode.h" -#include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" -#include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" #include "commands/cmd_quit.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; -extern int MODCOUNT; -extern ModuleList modules; -extern FactoryList factory; -extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern std::vector local_users; -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; -void cmd_quit::Handle (const char** parameters, int pcnt, userrec *user) -{ - user_hash::iterator iter = clientlist.find(user->nick); - char reason[MAXBUF]; - 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]++; +extern "C" DllExport command_t* init_command(InspIRCd* Instance) +{ + return new cmd_quit(Instance); +} - strlcpy(reason, parameters[0],MAXQUIT-1); +CmdResult cmd_quit::Handle (const char** parameters, int pcnt, userrec *user) +{ - /* We should only prefix the quit for a local user. Remote users have - * already been prefixed, where neccessary, by the upstream server. - */ - if (user->fd > -1) - { - Write(user->fd,"ERROR :Closing link (%s@%s) [%s%s]",user->ident,user->host,Config->PrefixQuit,parameters[0]); - WriteOpers("*** Client exiting: %s!%s@%s [%s%s]",user->nick,user->ident,user->host,Config->PrefixQuit,parameters[0]); - WriteCommonExcept(user,"QUIT :%s%s",Config->PrefixQuit,parameters[0]); - } - else - { - WriteOpers("*** Client exiting at %s: %s!%s@%s [%s]",user->server,user->nick,user->ident,user->host,parameters[0]); - WriteCommonExcept(user,"QUIT :%s",parameters[0]); - } - FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,std::string(Config->PrefixQuit)+std::string(parameters[0]))); + std::string quitmsg; - } + if (IS_LOCAL(user)) + { + if (*ServerInstance->Config->FixedQuit) + quitmsg = ServerInstance->Config->FixedQuit; else - { - Write(user->fd,"ERROR :Closing link (%s@%s) [QUIT]",user->ident,user->host); - WriteOpers("*** Client exiting: %s!%s@%s [Client exited]",user->nick,user->ident,user->host); - WriteCommonExcept(user,"QUIT :Client exited"); - FOREACH_MOD(I_OnUserQuit,OnUserQuit(user,"Client exited")); - - } - AddWhoWas(user); + quitmsg = pcnt ? + ServerInstance->Config->PrefixQuit + std::string(parameters[0]) + ServerInstance->Config->SuffixQuit + : "Client exited"; } + else + quitmsg = pcnt ? parameters[0] : "Client exited"; - FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user)); + userrec::QuitUser(ServerInstance, user, quitmsg); - /* push the socket on a stack of sockets due to be closed at the next opportunity */ - if (user->fd > -1) - { - ServerInstance->SE->DelFd(user->fd); - if (find(local_users.begin(),local_users.end(),user) != local_users.end()) - { - log(DEBUG,"Delete local user"); - local_users.erase(find(local_users.begin(),local_users.end(),user)); - } - user->CloseSocket(); - } - - if (iter != clientlist.end()) - { - clientlist.erase(iter); - } - - if (user->registered == REG_ALL) { - purge_empty_chans(user); - } - if (user->fd > -1) - fd_ref_table[user->fd] = NULL; - DELETE(user); + return CMD_SUCCESS; } +