Changeset 758

Timestamp:

07/07/06 04:14:44 (6 years ago)

Author:

wd

Message:

Use client_change_nick for unregistered users too. Change it to support
that behavior correctly.

Location:

branches/ithildin-1.1/modules/ircd

Files:

• client.c (modified) (1 diff)
• commands/nick.c (modified) (2 diffs)

branches/ithildin-1.1/modules/ircd/client.c

@@ -139 +139 @@
  * however, as that is left up to the caller. */
 void client_change_nick(client_t *cli, char *to) {
-    int casechng;
+    int casechng = !istrcmp(ircd.maps.nick, cli->nick, to);
     
     /* check to see if this is just a case change.  if it is, istrcmp will
      * return 0.  if it's a case change, we don't do anything except set the
      * new nickname in the client structure. */
-    casechng = !istrcmp(ircd.maps.nick, cli->nick, to);
-    if (!casechng) {
+    if (*cli->nick != '\0' && !casechng) {
         hash_delete(ircd.hashes.client, cli);
-        client_add_history(cli);
-    }
+
+        /* History entries for unregistered clients are extremely useless,
+         * and detrimental sometimes. */
+        if (CLIENT_REGISTERED(cli))
+            client_add_history(cli);
+    }
+
     strncpy(cli->nick, to, NICKLEN);
+
     if (!casechng) {
         hash_insert(ircd.hashes.client, cli);
-        hook_event(ircd.events.client_nick, cli);
+
+        /* We only hook client_nick for registered clients, there is little
+         * value in hooking it for nonregistered folks. */
+        if (CLIENT_REGISTERED(cli))
+            hook_event(ircd.events.client_nick, cli);
     }
 }

branches/ithildin-1.1/modules/ircd/commands/nick.c

@@ -106 +106 @@
             sendto_one(cli, RPL_FMT(cli, changeok), argv[1]);
         else if (changeok < 0) {
-            strcpy(cli->nick, argv[1]);
-            /* add the client to the hash immediately to prevent collisions. */
-            hash_insert(ircd.hashes.client, cli);
+            client_change_nick(cli, argv[1]);
             /* if the username has been filled in then assume the USER command
              * was called as well. */
@@ -158 +156 @@
      * a channel, sendto_common_channels ensures they'll get the message */
     sendto_common_channels(cli, NULL, "NICK", ":%s", argv[1]);
-    sendto_serv_butone(sptr, cli, NULL, NULL, "NICK", "%s :%d", argv[1],
-            cli->ts);
+    sendto_serv_butone(sptr, cli, NULL, NULL, "NICK", "%s :%d",
+            argv[1], cli->ts);
     client_change_nick(cli, argv[1]);