X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_kill.cpp;h=373ec7c9d9dccb7a08a0503071607fcc7d7191fb;hb=bfdf503e5204ba17479084e688a3605dbc9007a2;hp=ac3f3686d93e368443209f84a7da5cf1574934c4;hpb=60f91c5c3c313115dc4e92af9d728c493d8bc6aa;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp index ac3f3686d..373ec7c9d 100644 --- a/src/cmd_kill.cpp +++ b/src/cmd_kill.cpp @@ -2,106 +2,116 @@ * | 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. * * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" -#include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include +#include "configreader.h" #include "users.h" -#include "ctables.h" -#include "globals.h" #include "modules.h" -#include "dynamic.h" -#include "message.h" -#include "commands.h" -#include "inspstring.h" -#include "helperfuncs.h" -#include "hashcomp.h" -#include "typedefs.h" -#include "cmd_kill.h" +#include "wildcard.h" +#include "commands/cmd_kill.h" -extern ServerConfig* Config; -extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; -extern user_hash clientlist; +extern "C" DllExport command_t* init_command(InspIRCd* Instance) +{ + return new cmd_kill(Instance); +} -void cmd_kill::Handle (char **parameters, int pcnt, userrec *user) +/** Handle /KILL + */ +CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user) { - userrec *u = Find(parameters[0]); + /* Allow comma seperated lists of users for /KILL (thanks w00t) */ + if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0)) + return CMD_SUCCESS; + + userrec *u = ServerInstance->FindNick(parameters[0]); char killreason[MAXBUF]; + char killoperreason[MAXBUF]; int MOD_RESULT = 0; - log(DEBUG,"kill: %s %s", parameters[0], parameters[1]); - if (u) { - log(DEBUG, "into kill mechanism"); - FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1])); - - if (MOD_RESULT) + /* + * Here, we need to decide how to munge kill messages. Whether to hide killer, what to show opers, etc. + * We only do this when the command is being issued LOCALLY, for remote KILL, we just copy the message we got. + * + * This conditional is so that we only append the "Killed (" prefix ONCE. If killer is remote, then the kill + * just gets processed and passed on, otherwise, if they are local, it gets prefixed. Makes sense :-) -- w00t + */ + if (IS_LOCAL(user)) { - log(DEBUG, "A module prevented the kill with result %d", MOD_RESULT); - return; - } + /* + * Moved this event inside the IS_LOCAL check also, we don't want half the network killing a user + * and the other half not. This would be a bad thing. ;p -- w00t + */ + FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1])); - if (!IS_LOCAL(u)) - { - // remote kill - WriteOpers("*** Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]); - snprintf(killreason, MAXBUF,"[%s] Killed (%s (%s))", Config->ServerName, user->nick, parameters[1]); - WriteCommonExcept(u, "QUIT :%s", killreason); - FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason)); - - user_hash::iterator iter = clientlist.find(u->nick); + if (MOD_RESULT) + return CMD_FAILURE; - if (iter != clientlist.end()) + if (*ServerInstance->Config->HideKillsServer) { - log(DEBUG,"deleting user hash value %d", iter->second); - clientlist.erase(iter); + // hidekills is on, use it + snprintf(killreason, MAXQUIT, "Killed (%s (%s))", ServerInstance->Config->HideKillsServer, parameters[1]); } - - if (u->registered == 7) + else { - purge_empty_chans(u); + // hidekills is off, do nothing + snprintf(killreason, MAXQUIT, "Killed (%s (%s))", user->nick, parameters[1]); } - delete u; + // opers are lucky ducks, they always see the real reason + snprintf(killoperreason, MAXQUIT, "Killed (%s (%s))", user->nick, parameters[1]); + } + else + { + snprintf(killreason, MAXQUIT, "%s", parameters[1]); + /* + * XXX - yes, this means opers will probably see a censored kill remotely. this needs fixing. + * maybe a version of QuitUser that doesn't take nor propegate an oper reason? -- w00t + */ + snprintf(killoperreason, MAXQUIT, "%s", parameters[1]); + } + + /* + * Now we need to decide whether or not to send a local or remote snotice. Currently this checking is a little flawed. + * No time to fix it right now, so left a note. -- w00t + */ + if (!IS_LOCAL(u)) + { + // remote kill + ServerInstance->SNO->WriteToSnoMask('K', "Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]); + FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason)); } else { // local kill - log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, Config->ServerName, user->dhost, user->nick, parameters[1]); - WriteTo(user, u, "KILL %s :%s!%s!%s (%s)", u->nick, Config->ServerName, user->dhost, user->nick, parameters[1]); - WriteOpers("*** Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]); - snprintf(killreason,MAXBUF,"Killed (%s (%s))", user->nick, parameters[1]); - kill_link(u, killreason); + /* + * XXX - this isn't entirely correct, servers A - B - C, oper on A, client on C. Oper kills client, A and B will get remote kill + * snotices, C will get a local kill snotice. this isn't accurate, and needs fixing at some stage. -- w00t + */ + ServerInstance->SNO->WriteToSnoMask('k',"Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]); + ServerInstance->Log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]); + user->WriteTo(u, "KILL %s :%s!%s!%s (%s)", *ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : u->nick, + ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]); } + + // send the quit out + userrec::QuitUser(ServerInstance, u, killreason, killoperreason); } else { - WriteServ(user->fd, "401 %s %s :No such nick/channel", user->nick, parameters[0]); + user->WriteServ( "401 %s %s :No such nick/channel", user->nick, parameters[0]); + return CMD_FAILURE; } -} + return CMD_SUCCESS; +}