X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_nick.cpp;h=a7472bd95d9710fd648db59f2200b0dc676d4d30;hb=76ebc88ccd6fef0bf2d97b607829fb3466e273af;hp=dd38503427f054266f98e11e2e08cd3dceda197b;hpb=a9b90ecb4329498aba52da6aaa9812e3a70b8e11;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp index dd3850342..a7472bd95 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,21 @@ * --------------------------------------------------- */ -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" - -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]; +#include "commands/cmd_nick.h" -void cmd_nick::Handle (char **parameters, int pcnt, userrec *user) +void cmd_nick::Handle (const char** parameters, int pcnt, userrec *user) { char oldnick[NICKMAX]; @@ -102,45 +67,42 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user) * 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); + strlcpy(oldnick, user->nick, NICKMAX - 1); int MOD_RESULT = 0; FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0])); if (MOD_RESULT) return; - strlcpy(user->nick,parameters[0],NICKMAX); - if (user->registered == 7) - WriteCommon(user,"NICK %s",parameters[0]); + if (user->registered == REG_ALL) + user->WriteCommon("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])) { - WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0])); - WriteServ(user->fd,"432 %s %s :Invalid nickname: %s",user->nick,parameters[0],matches_qline(parameters[0])); + ServerInstance->WriteOpers("*** Q-Lined nickname %s from %s!%s@%s: %s",parameters[0],user->nick,user->ident,user->host,matches_qline(parameters[0])); + user->WriteServ("432 %s %s :Invalid nickname: %s",user->nick,parameters[0],matches_qline(parameters[0])); return; } - if ((Find(parameters[0])) && (Find(parameters[0]) != user)) + if ((ServerInstance->FindNick(parameters[0])) && (ServerInstance->FindNick(parameters[0]) != user)) { - WriteServ(user->fd,"433 %s %s :Nickname is already in use.",user->nick,parameters[0]); + user->WriteServ("433 %s %s :Nickname is already in use.",user->nick,parameters[0]); return; } } - if (isnick(parameters[0]) == 0) + if ((!ServerInstance->IsNick(parameters[0])) && (IS_LOCAL(user))) { - WriteServ(user->fd,"432 %s %s :Erroneous Nickname",user->nick,parameters[0]); + user->WriteServ("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(I_OnUserPreNick,OnUserPreNick(user,parameters[0])); @@ -149,53 +111,50 @@ void cmd_nick::Handle (char **parameters, int pcnt, userrec *user) return; } - WriteCommon(user,"NICK %s",parameters[0]); + user->WriteCommon("NICK %s",parameters[0]); } - 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]); + user = user->UpdateNickHash(parameters[0]); /* actually change the nick within the record */ 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 (ServerInstance->Config->NoUserDns) { - log(DEBUG,"Failed to create DNS lookup thread for user %s",user->nick); + user->dns_done = true; + } + else + { + user->StartDNSLookup(); + if (user->dns_done) + log(DEBUG,"Aborting dns lookup of %s because dns server experienced a failure.",user->nick); } -#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); -#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(I_OnUserRegister,OnUserRegister(user)); - ConnectUser(user); + //ConnectUser(user,NULL); } - if (user->registered == 7) + if (user->registered == REG_ALL) { FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick)); } } -