X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_nick.c;h=b612f8672b9e0cd42c4002b41c81c69589d04663;hb=894ccd3b8d5acb0067562d26bf72228d3e617203;hp=4307160c4a1f63cbe1b9767afb8cf097b04d7f07;hpb=b5253a88953deac93d3e9c469cb9b4e3b8c7fd8e;p=ircu2.10.12-pk.git diff --git a/ircd/m_nick.c b/ircd/m_nick.c index 4307160..b612f86 100644 --- a/ircd/m_nick.c +++ b/ircd/m_nick.c @@ -86,6 +86,8 @@ #include "hash.h" #include "ircd.h" #include "ircd_chattr.h" +#include "ircd_features.h" +#include "ircd_log.h" #include "ircd_reply.h" #include "ircd_string.h" #include "msg.h" @@ -95,11 +97,44 @@ #include "s_misc.h" #include "s_user.h" #include "send.h" +#include "sys.h" -#include +/* #include -- Now using assert in ircd_log.h */ #include #include + /* +* 'do_nick_name' ensures that the given parameter (nick) is really a proper +* string for a nickname (note, the 'nick' may be modified in the process...) +* +* RETURNS the length of the final NICKNAME (0, if nickname is invalid) +* +* Nickname characters are in range 'A'..'}', '_', '-', '0'..'9' +* anything outside the above set will terminate nickname. +* In addition, the first character cannot be '-' or a Digit. +* +* Note: +* The '~'-character should be allowed, but a change should be global, +* some confusion would result if only few servers allowed it... +*/ +static int do_nick_name(char* nick) +{ + char* ch = nick; + char* end = ch + NICKLEN; + assert(0 != ch); + + /* first character in [0..9-] */ + if (*ch == '-' || IsDigit(*ch)) + return 0; + for ( ; (ch < end) && *ch; ++ch) + if (!IsNickChar(*ch)) + break; + + *ch = '\0'; + + return (ch - nick); +} + /* * m_nick - message handler for local clients * parv[0] = sender prefix @@ -111,27 +146,25 @@ int m_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) char nick[NICKLEN + 2]; char* arg; char* s; - const char* client_name; assert(0 != cptr); assert(cptr == sptr); - /* - * parv[0] will be empty for clients connecting for the first time - */ - client_name = (*(cli_name(sptr))) ? cli_name(sptr) : "*"; + if (IsServerPort(cptr)) + return exit_client(cptr, cptr, &me, "Use a different port"); if (parc < 2) { send_reply(sptr, ERR_NONICKNAMEGIVEN); return 0; } + /* * Don't let them send make us send back a really long string of * garbage */ arg = parv[1]; - if (strlen(arg) > NICKLEN) - arg[NICKLEN] = '\0'; + if (strlen(arg) > IRCD_MIN(NICKLEN, feature_int(FEAT_NICKLEN))) + arg[IRCD_MIN(NICKLEN, feature_int(FEAT_NICKLEN))] = '\0'; if ((s = strchr(arg, '~'))) *s = '\0'; @@ -139,10 +172,7 @@ int m_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) strcpy(nick, arg); /* - * If do_nick_name() returns a null name OR if the server sent a nick - * name and do_nick_name() changed it in some way (due to rules of nick - * creation) then reject it. If from a server and we reject it, - * and KILL it. -avalon 4/4/92 + * If do_nick_name() returns a null name then reject it. */ if (0 == do_nick_name(nick)) { send_reply(sptr, ERR_ERRONEUSNICKNAME, arg); @@ -208,10 +238,15 @@ int m_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) * "dormant nick" way of generating collisions... * * XXX - hmmm can this happen after one is registered? + * + * Yes, client 1 connects to IRC and registers, client 2 connects and + * sends "NICK foo" but doesn't send anything more. client 1 now does + * /nick foo, they should succeed and client 2 gets disconnected with + * the message below. */ if (IsUnknown(acptr) && MyConnect(acptr)) { - ++ServerStats->is_ref; - IPcheck_connect_fail(cli_ip(acptr)); + ServerStats->is_ref++; + IPcheck_connect_fail(acptr, 0); exit_client(cptr, acptr, &me, "Overridden by other sign on"); return set_nick_name(cptr, sptr, nick, parc, parv); } @@ -245,16 +280,18 @@ int m_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) */ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) { - struct Client* acptr; - char nick[NICKLEN + 2]; - time_t lastnick = 0; - int differ = 1; + struct Client *acptr; + char nick[NICKLEN + 2]; + time_t lastnick = 0; + int differ = 1; + const char *type; assert(0 != cptr); assert(0 != sptr); assert(IsServer(cptr)); - if ((IsServer(sptr) && parc < 8) || parc < 3) { + if ((IsServer(sptr) && parc < 8) || parc < 3) + { sendto_opmask_butone(0, SNO_OLDSNO, "bad NICK param count for %s from %C", parv[1], cptr); return need_more_params(sptr, "NICK"); @@ -263,12 +300,14 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) ircd_strncpy(nick, parv[1], NICKLEN); nick[NICKLEN] = '\0'; - if (IsServer(sptr)) { + if (IsServer(sptr)) + { lastnick = atoi(parv[3]); if (lastnick > OLDEST_TS && !IsBurstOrBurstAck(sptr)) cli_serv(sptr)->lag = TStime() - lastnick; } - else { + else + { lastnick = atoi(parv[2]); if (lastnick > OLDEST_TS && !IsBurstOrBurstAck(sptr)) cli_serv(cli_user(sptr)->server)->lag = TStime() - lastnick; @@ -279,16 +318,18 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) * creation) then reject it. If from a server and we reject it, * and KILL it. -avalon 4/4/92 */ - if (0 == do_nick_name(nick) || 0 != strcmp(nick, parv[1])) { + if (!do_nick_name(nick) || strcmp(nick, parv[1])) + { send_reply(sptr, ERR_ERRONEUSNICKNAME, parv[1]); - + ++ServerStats->is_kill; sendto_opmask_butone(0, SNO_OLDSNO, "Bad Nick: %s From: %s %C", parv[1], parv[0], cptr); sendcmdto_one(&me, CMD_KILL, cptr, "%s :%s (%s <- %s[%s])", IsServer(sptr) ? parv[parc - 2] : parv[0], cli_name(&me), parv[1], nick, cli_name(cptr)); - if (!IsServer(sptr)) { + if (!IsServer(sptr)) + { /* * bad nick _change_ */ @@ -300,47 +341,10 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) } return 0; } - /* - * Check against nick name collisions. - * - * Put this 'if' here so that the nesting goes nicely on the screen :) - * We check against server name list before determining if the nickname - * is present in the nicklist (due to the way the below for loop is - * constructed). -avalon - */ - - acptr = FindClient(nick); - if (!acptr) { - /* - * No collisions, all clear... - */ + /* Check against nick name collisions. */ + if ((acptr = FindClient(nick)) == NULL) + /* No collisions, all clear... */ return set_nick_name(cptr, sptr, nick, parc, parv); - } - assert(0 != acptr); - - if (IsServer(acptr)) { /* shouldn't even happen, actually */ - /* - * We have a nickname trying to use the same name as - * a server. Send out a nick collision KILL to remove - * the nickname. As long as only a KILL is sent out, - * there is no danger of the server being disconnected. - * Ultimate way to jupiter a nick ? >;-). -avalon - */ - sendto_opmask_butone(0, SNO_OLDSNO, "Nick collision on %C(%C <- %C)", sptr, - cli_from(acptr), cptr); - ++ServerStats->is_kill; - - sendcmdto_one(&me, CMD_KILL, cptr, "%C :%s (%s <- %s)", sptr, cli_name(&me), - cli_name(cli_from(acptr)), cli_name(cptr)); - - cli_flags(sptr) |= FLAGS_KILLED; - /* - * if sptr is a server it is exited here, nothing else to do - */ - return exit_client_msg(cptr, sptr, &me, - "Killed (*.undernet.org (%s <- %s))", - cli_name(cli_from(acptr)), cli_name(cptr)); - } /* * If acptr == sptr, then we have a client doing a nick @@ -348,23 +352,16 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) * is concerned (user is changing the case of his/her * nickname or somesuch) */ - if (acptr == sptr) { + if (acptr == sptr) + { if (strcmp(cli_name(acptr), nick) != 0) - /* - * Allows change of case in his/her nick - */ + /* Allows change of case in his/her nick */ return set_nick_name(cptr, sptr, nick, parc, parv); else - /* - * This is just ':old NICK old' type thing. - * Just forget the whole thing here. There is - * no point forwarding it to anywhere, - * especially since servers prior to this - * version would treat it as nick collision. - */ - return 0; /* NICK Message ignored */ + /* Setting their nick to what it already is? Ignore it. */ + return 0; } - + /* now we know we have a real collision. */ /* * Note: From this point forward it can be assumed that * acptr != sptr (point to different client structures). @@ -376,9 +373,10 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) * and proceed with the nick. This should take care of the * "dormant nick" way of generating collisions... */ - if (IsUnknown(acptr) && MyConnect(acptr)) { - ++ServerStats->is_ref; - IPcheck_connect_fail(cli_ip(acptr)); + if (IsUnknown(acptr) && MyConnect(acptr)) + { + ServerStats->is_ref++; + IPcheck_connect_fail(acptr, 0); exit_client(cptr, acptr, &me, "Overridden by other sign on"); return set_nick_name(cptr, sptr, nick, parc, parv); } @@ -400,32 +398,37 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) * --Run * */ - if (IsServer(sptr)) { + if (IsServer(sptr)) + { + struct irc_in_addr ip; /* * A new NICK being introduced by a neighbouring * server (e.g. message type ":server NICK new ..." received) * * compare IP address and username */ - differ = (cli_ip(acptr).s_addr != htonl(base64toint(parv[parc - 3]))) || + base64toip(parv[parc - 3], &ip); + differ = (0 != memcmp(&cli_ip(acptr), &ip, sizeof(cli_ip(acptr)))) || (0 != ircd_strcmp(cli_user(acptr)->username, parv[4])); sendto_opmask_butone(0, SNO_OLDSNO, "Nick collision on %C (%C %Tu <- " "%C %Tu (%s user@host))", acptr, cli_from(acptr), cli_lastnick(acptr), cptr, lastnick, differ ? "Different" : "Same"); } - else { + else + { /* * A NICK change has collided (e.g. message type ":old NICK new"). * * compare IP address and username */ - differ = (cli_ip(acptr).s_addr != cli_ip(sptr).s_addr) || - (0 != ircd_strcmp(cli_user(acptr)->username, cli_user(sptr)->username)); + differ = (0 != memcmp(&cli_ip(acptr), &cli_ip(sptr), sizeof(cli_ip(acptr)))) || + (0 != ircd_strcmp(cli_user(acptr)->username, cli_user(sptr)->username)); sendto_opmask_butone(0, SNO_OLDSNO, "Nick change collision from %C to " "%C (%C %Tu <- %C %Tu)", sptr, acptr, cli_from(acptr), cli_lastnick(acptr), cptr, lastnick); } + type = differ ? "overruled by older nick" : "nick collision from same user@host"; /* * Now remove (kill) the nick on our side if it is the youngest. * If no timestamp was received, we ignore the incoming nick @@ -435,62 +438,58 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[]) * * This exits the client sending the NICK message */ - if (cli_from(acptr) != cptr) { - if ((differ && lastnick >= cli_lastnick(acptr)) || - (!differ && lastnick <= cli_lastnick(acptr))) { - if (!IsServer(sptr)) { - ++ServerStats->is_kill; - sendcmdto_serv_butone(&me, CMD_KILL, sptr, "%C :%s (Nick collision)", - sptr, cli_name(&me)); - assert(!MyConnect(sptr)); - - cli_flags(sptr) |= FLAGS_KILLED; - exit_client(cptr, sptr, &me, - "Killed (*.undernet.org (Nick collision))"); - /* - * we have killed sptr off, zero out it's pointer so if it's used - * again we'll know about it --Bleep - */ - sptr = 0; - } - if (lastnick != cli_lastnick(acptr)) - return 0; /* Ignore the NICK */ + if ((differ && lastnick >= cli_lastnick(acptr)) || + (!differ && lastnick <= cli_lastnick(acptr))) + { + ServerStats->is_kill++; + if (!IsServer(sptr)) + { + /* If this was a nick change and not a nick introduction, we + * need to ensure that we remove our record of the client, and + * send a KILL to the whole network. + */ + assert(!MyConnect(sptr)); + /* Inform the rest of the net... */ + sendcmdto_serv_butone(&me, CMD_KILL, 0, "%C :%s (%s)", + sptr, cli_name(&me), type); + /* Don't go sending off a QUIT message... */ + SetFlag(sptr, FLAG_KILLED); + /* Remove them locally. */ + exit_client_msg(cptr, sptr, &me, + "Killed (%s (%s))", + feature_str(FEAT_HIS_SERVERNAME), type); } - send_reply(acptr, ERR_NICKCOLLISION, nick); + else + { + /* If the origin is a server, this was a new client, so we only + * send the KILL in the direction it came from. We have no + * client record that we would have to clean up. + */ + sendcmdto_one(&me, CMD_KILL, cptr, "%s :%s (%s)", + parv[parc - 2], cli_name(&me), type); + } + /* If the timestamps differ and we just killed sptr, we don't need to kill + * acptr as well. + */ + if (lastnick != cli_lastnick(acptr)) + return 0; } + /* Tell acptr why we are killing it. */ + send_reply(acptr, ERR_NICKCOLLISION, nick); - ++ServerStats->is_kill; - cli_flags(acptr) |= FLAGS_KILLED; + ServerStats->is_kill++; + SetFlag(acptr, FLAG_KILLED); /* * This exits the client we had before getting the NICK message */ - if (differ) { - sendcmdto_serv_butone(&me, CMD_KILL, acptr, "%C :%s (older nick " - "overruled)", acptr, cli_name(&me)); - if (MyConnect(acptr)) { - sendcmdto_one(acptr, CMD_QUIT, cptr, ":Killed (*.undernet.org (older " - "nick overruled))"); - sendcmdto_one(&me, CMD_KILL, acptr, "%C :*.undernet.org (older nick " - "overruled)", acptr); - } - exit_client(cptr, acptr, &me, "Killed (*.undernet.org (older nick " - "overruled))"); - } - else { - sendcmdto_serv_butone(&me, CMD_KILL, acptr, "%C :%s (nick collision from " - "same user@host)", acptr, cli_name(&me)); - if (MyConnect(acptr)) { - sendcmdto_one(acptr, CMD_QUIT, cptr, ":Killed (*.undernet.org (nick " - "collision from same user@host))"); - sendcmdto_one(&me, CMD_KILL, acptr, "%C :*.undernet.org (older nick " - "overruled)", acptr); - } - exit_client(cptr, acptr, &me, "Killed (*.undernet.org (nick collision " - "from same user@host))"); - } + sendcmdto_serv_butone(&me, CMD_KILL, NULL, "%C :%s (%s)", + acptr, feature_str(FEAT_HIS_SERVERNAME), + type); + exit_client_msg(cptr, acptr, &me, "Killed (%s (%s))", + feature_str(FEAT_HIS_SERVERNAME), type); if (lastnick == cli_lastnick(acptr)) return 0; - - assert(0 != sptr); + if (sptr == NULL) + return 0; return set_nick_name(cptr, sptr, nick, parc, parv); }