"CAP REQ" starts capability negotiation and delays user registration

[ngircd-alex.git] / src / ngircd / irc-cap.c

diff --git a/src/ngircd/irc-cap.c b/src/ngircd/irc-cap.c
index 926943c859ab5f265ac3dda585e62ea2ff2bb4cb..c92a3f392dd38fea3a3aa53ab225460dc3898ff2 100644 (file)
--- a/src/ngircd/irc-cap.c
+++ b/src/ngircd/irc-cap.c
@@ -40,6 +40,9 @@ bool Handle_CAP_ACK PARAMS((CLIENT *Client, char *Arg));
 bool Handle_CAP_CLEAR PARAMS((CLIENT *Client));
 bool Handle_CAP_END PARAMS((CLIENT *Client));
 
+void Set_CAP_Negotiation PARAMS((CLIENT *Client));
+
+
 /**
  * Handler for the IRCv3 "CAP" command.
  *
@@ -96,10 +99,8 @@ Handle_CAP_LS(CLIENT *Client, UNUSED char *Arg)
 {
        assert(Client != NULL);
 
-       if (Client_Type(Client) != CLIENT_USER)
-               Client_CapAdd(Client, CLIENT_CAP_PENDING);
+       Set_CAP_Negotiation(Client);
 
-       Client_CapAdd(Client, CLIENT_CAP_SUPPORTED);
        return IRC_WriteStrClient(Client, "CAP %s LS :", Client_ID(Client));
 }
 
@@ -131,6 +132,8 @@ Handle_CAP_REQ(CLIENT *Client, char *Arg)
        assert(Client != NULL);
        assert(Arg != NULL);
 
+       Set_CAP_Negotiation(Client);
+
        return IRC_WriteStrClient(Client, "CAP %s NAK :%s",
                                  Client_ID(Client), Arg);
 }
@@ -180,7 +183,7 @@ Handle_CAP_END(CLIENT *Client)
                /* User is still logging in ... */
                Client_CapDel(Client, CLIENT_CAP_PENDING);
 
-               if (Client_Type(Client) == CLIENT_GOTUSER) {
+               if (Client_Type(Client) == CLIENT_WAITCAPEND) {
                        /* Only "CAP END" was missing: log in! */
                        return Login_User(Client);
                }
@@ -189,4 +192,19 @@ Handle_CAP_END(CLIENT *Client)
        return CONNECTED;
 }
 
+/**
+ * Set CAP negotiation status and mark client as "supports capabilities".
+ *
+ * @param Client The client to handle.
+ */
+void
+Set_CAP_Negotiation(CLIENT *Client)
+{
+       assert(Client != NULL);
+
+       if (Client_Type(Client) != CLIENT_USER)
+               Client_CapAdd(Client, CLIENT_CAP_PENDING);
+       Client_CapAdd(Client, CLIENT_CAP_SUPPORTED);
+}
+
 /* -eof- */