Changeset 0ef1c92

Timestamp:

2015-09-11T02:31:10Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

dc96e6e

Parents:

34d16d5

git-author:

dequis <dx@…> (27-07-15 05:14:09)

git-committer:

dequis <dx@…> (11-09-15 02:31:10)

Message:

Initial implementation of ircv3 capability negotiation

Mostly no-op for now. Puts registration on hold, supports the basic
commands, and NAKs everything

Files:

• irc.c (modified) (1 diff)
• irc.h (modified) (2 diffs)
• irc_commands.c (modified) (2 diffs)
• irc_send.c (modified) (1 diff)

irc.c

@@ -727 +727 @@
 int irc_check_login(irc_t *irc)
 {
-        if (irc->user->user && irc->user->nick) {
+        if (irc->user->user && irc->user->nick && !(irc->status & USTATUS_CAP_PENDING)) {
                 if (global.conf->authmode == AUTHMODE_CLOSED && !(irc->status & USTATUS_AUTHORIZED)) {
                         irc_send_num(irc, 464, ":This server is password-protected.");

irc.h

@@ -49 +49 @@
         USTATUS_SHUTDOWN = 8,   /* Now used to indicate we're shutting down.
                                    Currently just blocks irc_vawrite(). */
+        USTATUS_CAP_PENDING = 16,
 
         /* Not really status stuff, but other kinds of flags: For slightly
@@ -331 +332 @@
                                      irc_channel_user_flags_t old_flags, irc_channel_user_flags_t new_flags);
 void irc_send_invite(irc_user_t *iu, irc_channel_t *ic);
+void irc_send_cap(irc_t *irc, char *subcommand, char *body);
 
 /* irc_user.c */

irc_commands.c

@@ -28 +28 @@
 #include "help.h"
 #include "ipc.h"
+
+static void irc_cmd_cap(irc_t *irc, char **cmd)
+{
+        if (!(irc->status & USTATUS_LOGGED_IN)) {
+                /* Put registration on hold until CAP END */
+                irc->status |= USTATUS_CAP_PENDING;
+        }
+
+        if (g_strcasecmp(cmd[1], "LS") == 0) {
+                /* gboolean irc302 = (g_strcmp0(cmd[2], "302") == 0); */
+                irc_send_cap(irc, "LS", "");
+
+        } else if (g_strcasecmp(cmd[1], "LIST") == 0) {
+                irc_send_cap(irc, "LIST", "");
+
+        } else if (g_strcasecmp(cmd[1], "REQ") == 0) {
+                irc_send_cap(irc, "NAK", cmd[2] ? : "");
+
+        } else if (g_strcasecmp(cmd[1], "END") == 0) {
+                irc->status &= ~USTATUS_CAP_PENDING;
+                irc_check_login(irc);
+
+        } else {
+                irc_send_num(irc, 410, "%s :Invalid CAP command", cmd[1]);
+        }
+
+}
 
 static void irc_cmd_pass(irc_t *irc, char **cmd)
@@ -685 +712 @@
 
 static const command_t irc_commands[] = {
+        { "cap",         1, irc_cmd_cap,         0 },
         { "pass",        1, irc_cmd_pass,        0 },
         { "user",        4, irc_cmd_user,        IRC_CMD_PRE_LOGIN },

irc_send.c

@@ -428 +428 @@
                   iu->nick, iu->user, iu->host, irc->user->nick, ic->name);
 }
+
+void irc_send_cap(irc_t *irc, char *subcommand, char *body)
+{
+        char *nick = irc->user->nick ? : "*";
+
+        irc_write(irc, ":%s CAP %s %s :%s", irc->root->host, nick, subcommand, body);
+}