Changeset 757 for branches

Timestamp:

07/05/06 02:17:59 (6 years ago)

Author:

wd

Message:

Fix SJOIN sending spurious gack, add an assert for a totally bogus condition
in check_collision.

Location:

branches/ithildin-1.1/modules/ircd/commands

Files:

• nick.c (modified) (1 diff)
• sjoin.c (modified) (5 diffs)

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

@@ -289 +289 @@
 check_collision(client_t *known, client_t *unknown, bool new) {
 
+    /* This condition is extremely incorrect for what should be obvious
+     * reasons. */
+    assert(known != unknown);
+
     /* known is the only one which might be a local connection.  if it is on
      * our server and is unregistered then drop it no matter what. */

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

@@ -39 +39 @@
     add_to_channel(cli, chan, true);
     sendto_channel_local(chan, cli, NULL, "JOIN", NULL);
-    sendto_serv_pflag_butone(PROTOCOL_SFL_SJOIN, true, sptr, cli, NULL, NULL,
-            "SJOIN", "%d %s", chan->created, chan->name);
-    sendto_serv_pflag_butone(PROTOCOL_SFL_SJOIN, false, sptr, cli, NULL, NULL,
-            "JOIN", "%s", chan->name);
+    sendto_serv_pflag_butone(PROTOCOL_SFL_SJOIN, true, cli->server, cli, NULL,
+            NULL, "SJOIN", "%d %s", chan->created, chan->name);
+    sendto_serv_pflag_butone(PROTOCOL_SFL_SJOIN, false, cli->server, cli, NULL,
+            NULL, "JOIN", "%s", chan->name);
 
     return COMMAND_WEIGHT_NONE;
@@ -118 +118 @@
              * channel. */
             sendto_channel_local(chan, cp, NULL, "JOIN", NULL);
-            sendto_serv_pflag_butone(PROTOCOL_SFL_SJOIN, false, sptr, cp,
+            sendto_serv_pflag_butone(PROTOCOL_SFL_SJOIN, false, srv, cp,
                     NULL, chan->name, "JOIN", NULL);
             if (changeok) {
@@ -137 +137 @@
                     /* okay... assume that non SJOIN servers also don't use
                      * TSMODE.. */
-                    sendto_serv_pflag_butone(PROTOCOL_SFL_SJOIN, false, sptr,
+                    sendto_serv_pflag_butone(PROTOCOL_SFL_SJOIN, false, srv,
                            NULL, srv, chan->name, "MODE", "+%s%s %d", modes,
                            modebuf, chan->created); 
@@ -153 +153 @@
     /* if we have leftover modes, send them first */
     if (changeok && mset) {
-        sendto_serv_pflag_butone(PROTOCOL_SFL_SJOIN, false, sptr,
+        sendto_serv_pflag_butone(PROTOCOL_SFL_SJOIN, false, srv,
                NULL, srv, chan->name, "MODE", "+%s%s %d", modes,
                modebuf, chan->created); 
@@ -168 +168 @@
         mlen += sprintf(&modebuf[mlen], " %s", argv[i++]);
 
-    sendto_serv_butone(srv, NULL, srv, NULL, "SJOIN", "%d %s %s%s :%s",
-            chan->created, chan->name, argv[3], modebuf, realjoiners);
+    sendto_serv_pflag_butone(PROTOCOL_SFL_SJOIN, true, srv, NULL, srv, NULL,
+            "SJOIN", "%d %s %s%s :%s", chan->created, chan->name, argv[3],
+            modebuf, realjoiners);
 
     return 1;