Changeset 752 for branches

Timestamp:

06/24/06 18:22:28 (6 years ago)

Author:

wd

Message:

Update topic to be sent first, update SVSMODE parsing to be more generic and
use the safer user_mode() function as well as fixing a bug in the way it
parses.

Location:

branches/ithildin-1.1/modules/ircd/commands

Files:

• svsmode.c (modified) (1 diff)
• topic.c (modified) (1 diff)

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

@@ -60 +60 @@
         channel_mode(cli, srv, chan, chan->created, argc - 2, argv + 2, 1);
     } else if ((cp = find_client(argv[1])) != NULL) {
-        /* this is less simple.  svsmode sends +d <x> to set 'services id' on
-         * people, and we'll handle that here.  XXX: this is a hack, and we
-         * should call user_mode() but we don't. :( */
-        if (isdigit(*argv[oarg]))
-            ts = str_conv_int(argv[oarg++], 0);
-        else
-            ts = 0;
+        /* Services setting "client modes."  There's also this sort of like,
+         * stupid hack where they send "+d <ts>" which is a 'servicesid'
+         * used to track clients on the network.  We one-off support this
+         * and treat everything else as a real client mode. */
 
-        if (ts && cp->ts != ts)
-            return; /* not the same client */
+        if (argc == 4 && !strcmp(argv[2], "+d")) {
+            /* this is so dumb */
+            SVSID(cp) = str_conv_int(argv[3], 0);
+        } else if (MYCLIENT(cp))
+            /* Is this our client?  If so do the usermode thing.  Otherwise
+             * just pass along the command, we expect a MODE back when it is
+             * processed by the user's server. */
+            user_mode(cp, cp, argv + 3, argc - 3, true);
 
-        oldmode = cp->modes;
-        s = argv[oarg++];
-        while (*s) {
-            switch (*s) {
-                case '+':
-                    plus = 1;
-                    break;
-                case '-':
-                    plus = 0;
-                    break;
-                case 'd':
-                    /* special case to set 'services id' */
-                    if (oarg < argc)
-                        SVSID(cp) = str_conv_int(argv[oarg++], 0);
-                    break;
-                default:
-                    if (plus)
-                        usermode_set(*s, NULL, cp, NULL, NULL);
-                    else
-                        usermode_unset(*s, NULL, cp, NULL, NULL);
-                    break;
-            }
-            s++;
-        }
-
-        if (MYCLIENT(cp))  {
-            usermode_diff(oldmode, cp->modes, result, 0);
-            if (*result != '\0') {
-                if (cli != NULL)
-                    sendto_one_from(cp, cli, NULL, "MODE", ":%s", result);
-                else
-                    sendto_one_from(cp, cp, NULL, "MODE", ":%s", result);
-            }
-        }
+        /* XXX: For modes with arguments (none exist - yet) we do not
+         * support the idea well.  What we really need to do and don't is to
+         * tack on all of argv.. broken. */
         if (argc > 3)
             sendto_serv_butone(sptr, cli, srv, cp->nick, "SVSMODE",
-                    "%d %s %s", ts, argv[2], argv[3]);
+                    "%s %s", ts, argv[2], argv[3]);
         else
             sendto_serv_butone(sptr, cli, srv, cp->nick, "SVSMODE",
-                    "%d %s", ts, argv[2]);
+                    "%s", ts, argv[2]);
     }
 }

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

@@ -37 +37 @@
     add_isupport("TOPICLEN", ISUPPORT_FL_INT, (char *)&i64);
 
-    add_hook(ircd.events.channel_add, topic_channel_add_hook);
+    /* stuff this hook in nice and early so we are always in front of NAMES.
+     * THis should be harmless, at least for now.  Some clients seem to
+     * depend on speculative wording in RFC1459 that says RPL_TOPIC and
+     * RPL_NAMREPLY are sent.  They believe this implies that RPL_TOPIC must
+     * be first.  Most clients do not break when this isn't the case, but a
+     * few poorly written ones do. */
+    add_hook_before(ircd.events.channel_add, topic_channel_add_hook, NULL);
+
     add_hook(ircd.events.server_establish, topic_server_establish_hook);