X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=ab286bee4b2ca925341e91d8f1ee2a33fcc89d17;hb=c80508b28be5947648f59710e6653f793a73bd76;hp=83bb96859f39e15f054544ec2bf27830db321250;hpb=293df6a8b55e89c127e60e92711ef0ef1027bff8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp index 83bb96859..ab286bee4 100644 --- a/src/cmd_nick.cpp +++ b/src/cmd_nick.cpp @@ -2,10 +2,10 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: - * - * + * + * * * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see @@ -14,56 +14,31 @@ * --------------------------------------------------- */ -using namespace std; - -#include "inspircd_config.h" -#include "inspircd.h" -#include "inspircd_io.h" -#include #include -#ifdef GCC3 -#include -#else -#include -#endif -#include -#include #include -#include +#include "inspircd_config.h" +#include "configreader.h" +#include "hash_map.h" #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 "dns.h" #include "helperfuncs.h" #include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" -#include "command_parse.h" -#include "cmd_nick.h" +#include "commands/cmd_nick.h" extern ServerConfig* Config; -extern InspIRCd* ServerInstance; extern int MODCOUNT; extern std::vector modules; extern std::vector factory; extern time_t TIME; -extern user_hash clientlist; -extern chan_hash chanlist; -extern whowas_hash whowas; -extern std::vector all_opers; -extern std::vector local_users; -extern userrec* fd_ref_table[65536]; -void cmd_nick::Handle (char **parameters, int pcnt, userrec *user) +void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user) { + char oldnick[NICKMAX]; + if (pcnt < 1) { log(DEBUG,"not enough params for handle_nick"); @@ -89,19 +64,32 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user) log(DEBUG,"invalid old nick passed to handle_nick"); return; } - if (!strcasecmp(user->nick,parameters[0])) + if (irc::string(user->nick) == irc::string(parameters[0])) { - log(DEBUG,"old nick is new nick, skipping"); + /* If its exactly the same, even case, dont do anything. */ + if (!strcmp(user->nick,parameters[0])) + return; + /* Its a change of case. People insisted that they should be + * able to do silly things like this even though the RFC says + * the nick AAA is the same as the nick aaa. + */ + log(DEBUG,"old nick is new nick, not updating hash (case change only)"); + strlcpy(oldnick, user->nick, NICKMAX - 1); + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0])); + if (MOD_RESULT) + return; + if (user->registered == REG_ALL) + WriteCommon(user,"NICK %s",parameters[0]); + strlcpy(user->nick, parameters[0], NICKMAX - 1); + FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick)); return; } else { - if (strlen(parameters[0]) > 1) + if ((*parameters[0] == ':') && (*(parameters[0]+1) != 0)) { - if (parameters[0][0] == ':') - { - *parameters[0]++; - } + parameters[0]++; } if (matches_qline(parameters[0])) { @@ -115,16 +103,16 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user) return; } } - if (isnick(parameters[0]) == 0) + if ((isnick(parameters[0]) == 0) && (IS_LOCAL(user))) { WriteServ(user->fd,"432 %s %s :Erroneous Nickname",user->nick,parameters[0]); return; } - if (user->registered == 7) + if (user->registered == REG_ALL) { int MOD_RESULT = 0; - FOREACH_RESULT(OnUserPreNick(user,parameters[0])); + FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0])); if (MOD_RESULT) { // if a module returns true, the nick change is silently forbidden. return; @@ -133,9 +121,8 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user) WriteCommon(user,"NICK %s",parameters[0]); } - - char oldnick[NICKMAX]; - strlcpy(oldnick,user->nick,NICKMAX); + + strlcpy(oldnick, user->nick, NICKMAX - 1); /* change the nick of the user in the users_hash */ user = ReHashNick(user->nick, parameters[0]); @@ -143,41 +130,49 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user) if (!user) return; if (!user->nick) return; - strlcpy(user->nick, parameters[0],NICKMAX); + strlcpy(user->nick, parameters[0], NICKMAX - 1); log(DEBUG,"new nick set: %s",user->nick); - if (user->registered < 3) + if (user->registered < REG_NICKUSER) { - user->registered = (user->registered | 2); + user->registered = (user->registered | REG_NICK); // dont attempt to look up the dns until they pick a nick... because otherwise their pointer WILL change // and unless we're lucky we'll get a duff one later on. //user->dns_done = (!lookup_dns(user->nick)); //if (user->dns_done) // log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick); -#ifdef THREADED_DNS - // initialize their dns lookup thread - if (pthread_create(&user->dnsthread, NULL, dns_task, (void *)user) != 0) + if (Config->NoUserDns) { - log(DEBUG,"Failed to create DNS lookup thread for user %s",user->nick); + user->dns_done = true; } + else + { +#ifdef THREADED_DNS + // initialize their dns lookup thread + pthread_attr_t attribs; + pthread_attr_init(&attribs); + pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_DETACHED); + if (pthread_create(&user->dnsthread, &attribs, dns_task, (void *)user) != 0) + { + log(DEBUG,"Failed to create DNS lookup thread for user %s: %s",user->nick, strerror(errno)); + } #else - user->dns_done = (!lookup_dns(user->nick)); - if (user->dns_done) - log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick); + user->dns_done = (!lookup_dns(user->nick)); + if (user->dns_done) + log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick); #endif - + } } - if (user->registered == 3) + if (user->registered == REG_NICKUSER) { /* user is registered now, bit 0 = USER command, bit 1 = sent a NICK command */ - FOREACH_MOD OnUserRegister(user); - ConnectUser(user); + FOREACH_MOD(I_OnUserRegister,OnUserRegister(user)); + //ConnectUser(user,NULL); } - if (user->registered == 7) + if (user->registered == REG_ALL) { - FOREACH_MOD OnUserPostNick(user,oldnick); + FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick)); } } -