Changeset 813 for branches

Timestamp:

10/01/07 03:22:42 (5 years ago)

Author:

wd

Message:

Update to work around dumb gaim bug.

File:

• branches/ithildin-1.1/modules/ircd/protocols/shared/rfc1459_io.c (modified) (1 diff)

branches/ithildin-1.1/modules/ircd/protocols/shared/rfc1459_io.c

@@ -99 +99 @@
 #ifdef RFC1459_SEND_MSG_LONG
     if (from->client != NULL)
-        sm.len = sprintf(buf, ":%s!%s@%s %s %s%s", from->client->nick,
-                from->client->user, from->client->host, cmd,
-                (to != NULL ? to : ""), (to != NULL ? " " : ""));
+        sm.len = sprintf(buf, ":%s!%s@%s %s", from->client->nick,
+                from->client->user, from->client->host, cmd);
 #else
     if (from->client != NULL)
-        sm.len = sprintf(buf, ":%s %s %s%s", from->client->nick, cmd,
-                (to != NULL ? to : ""), (to != NULL ? " " : ""));
+        sm.len = sprintf(buf, ":%s %s", from->client->nick, cmd);
 #endif
     else if (from->server != NULL)
-        sm.len = sprintf(buf, ":%s %s %s%s", from->server->name, cmd, 
-                (to != NULL ? to : ""), (to != NULL ? " " : ""));
+        sm.len = sprintf(buf, ":%s %s", from->server->name, cmd);
     else
-        sm.len = sprintf(buf, "%s %s%s", cmd,
-                (to != NULL ? to : ""), (to != NULL ? " " : ""));
-    if (msg != NULL)
+        sm.len = sprintf(buf, "%s", cmd);
+
+    /* If to is provided we format the message in a special way to work
+     * around some clients incorrect assumptions about the way the server
+     * is required to send messages.  Specifially the gaim/pidgin developers
+     * refuse to fix a bug in their parser related to handling the JOIN
+     * command properly when the last argument is not prefixed with a : (not
+     * required). */
+    if (to != NULL) {
+        if (msg == NULL)
+            sm.len += sprintf(buf + sm.len, " :%s", to);
+        else
+            sm.len += sprintf(buf + sm.len, " %s ", to);
+    }
+
+    if (msg != NULL) {
+        if (to == NULL)
+            /* we need an extra space because of the above.. */
+            buf[sm.len++] = ' ';
+
         sm.len += vsnprintf(&buf[sm.len], MAX_PACKET_LEN - 3 - sm.len, msg,
                 args);
+    }
 
     /* XXX: GREAT POTENTIAL FOR EVIL.  Someone running their server in