Move message parsing to ProcessBuffer and fix edge cases in it.

[user/henk/code/inspircd.git] / src / modules / m_cap.cpp

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 09d5e604dd12c3e617c3b88a9b799f503a4cdabb..80e70d3e57470d89ba883edde2ada430d47d55bd 100644 (file)
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -21,6 +21,12 @@
 #include "modules/reload.h"
 #include "modules/cap.h"
 
+enum
+{
+       // From IRCv3 capability-negotiation-3.1.
+       ERR_INVALIDCAPCMD = 410
+};
+
 namespace Cap
 {
        class ManagerImpl;
@@ -55,7 +61,8 @@ class Cap::ManagerImpl : public Cap::Manager, public ReloadModule::EventListener
 
        static bool CanRequest(LocalUser* user, Ext usercaps, Capability* cap, bool adding)
        {
-               if ((usercaps & cap->GetMask()) == adding)
+               const bool hascap = ((usercaps & cap->GetMask()) != 0);
+               if (hascap == adding)
                        return true;
 
                return cap->OnRequest(user, adding);
@@ -358,7 +365,7 @@ class CommandCap : public SplitCommand
                works_before_reg = true;
        }
 
-       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user) CXX11_OVERRIDE
+       CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
        {
                if (user->registered != REG_ALL)
                        holdext.set(user, 1);
@@ -398,7 +405,7 @@ class CommandCap : public SplitCommand
                }
                else
                {
-                       user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "%s :Invalid CAP subcommand", subcommand.c_str());
+                       user->WriteNumeric(ERR_INVALIDCAPCMD, subcommand.empty() ? "*" : subcommand, "Invalid CAP subcommand");
                        return CMD_FAILURE;
                }