DOH! Fix my muppetry of a segfault, and fix some warnings

[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 8a57de0c71bf010b49f0c9441d49fc9d8dffffa3..63d1d685f841dae9fc329504b5d91854f85fd707 100644 (file)
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -36,7 +36,6 @@ class CommandCAP : public Command
 {
        Module* Creator;
  public:
-       /* Command 'dalinfo', takes no parameters and needs no special modes */
        CommandCAP (InspIRCd* Instance, Module* mod) : Command(Instance,"CAP", 0, 1, true), Creator(mod)
        {
                this->source = "m_cap.so";
@@ -45,17 +44,43 @@ class CommandCAP : public Command
        CmdResult Handle (const char* const* parameters, int pcnt, User *user)
        {
                irc::string subcommand = parameters[0];
+
                if (subcommand == "REQ")
                {
                        CapData Data;
-                       Data.type = parameters[1];
+
+                       Data.type = subcommand;
                        Data.user = user;
                        Data.creator = this->Creator;
-                       Data.parameter = (pcnt > 1 ? parameters[1] : "");
+
+                       if (pcnt < 2)
+                               return CMD_FAILURE;
+
+                       // tokenize the input into a nice list of requested caps
+                       std::string param = parameters[1];
+                       std::string cap_;
+                       irc::spacesepstream cap_stream(param);
+
+                       while (cap_stream.GetToken(cap_))
+                       {
+                               Data.wanted.push_back(cap_);
+                       }
 
                        user->Extend("CAP_REGHOLD");
                        Event event((char*) &Data, (Module*)this->Creator, "cap_req");
                        event.Send(this->ServerInstance);
+
+                       if (Data.ack.size() > 0)
+                       {
+                               std::string AckResult = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
+                               user->WriteServ("CAP * ACK :%s", AckResult.c_str());
+                       }
+
+                       if (Data.wanted.size() > 0)
+                       {
+                               std::string NakResult = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
+                               user->WriteServ("CAP * NAK :%s", NakResult.c_str());
+                       }
                }
                else if (subcommand == "END")
                {
@@ -64,21 +89,43 @@ class CommandCAP : public Command
                else if ((subcommand == "LS") || (subcommand == "LIST"))
                {
                        CapData Data;
-                       user->Extend("CAP_REGHOLD");
+
                        Data.type = subcommand;
                        Data.user = user;
                        Data.creator = this->Creator;
-                       Data.parameter.clear();
 
+                       user->Extend("CAP_REGHOLD");
                        Event event((char*) &Data, (Module*)this->Creator, subcommand == "LS" ? "cap_ls" : "cap_list");
                        event.Send(this->ServerInstance);
 
-                       user->WriteServ("CAP * LS :%s", Data.parameter.c_str());
+                       std::string Result;
+                       if (Data.wanted.size() > 0)
+                               Result = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
+                       else
+                               Result = "";
+
+                       user->WriteServ("CAP * %s :%s", subcommand.c_str(), Result.c_str());
+               }
+               else if (subcommand == "CLEAR")
+               {
+                       CapData Data;
+
+                       Data.type = subcommand;
+                       Data.user = user;
+                       Data.creator = this->Creator;
+
+                       user->Extend("CAP_REGHOLD");
+                       Event event((char*) &Data, (Module*)this->Creator, "cap_clear");
+                       event.Send(this->ServerInstance);
+
+                       std::string Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
+                       user->WriteServ("CAP * ACK :%s", Result.c_str());
                }
                else
                {
-                       user->WriteServ("410 %s %s :Invalid CAP subcommand", user->nick, subcommand.c_str());
+                       user->WriteNumeric(410, "* %s :Invalid CAP subcommand", subcommand.c_str());
                }
+
                return CMD_FAILURE;
        }
 };
@@ -94,17 +141,17 @@ class ModuleCAP : public Module
                newcommand = new CommandCAP(ServerInstance, this);
                ServerInstance->AddCommand(newcommand);
 
-               Implementation eventlist[] = { I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect, I_OnRequest };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
+               Implementation eventlist[] = { I_OnCheckReady };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
        virtual bool OnCheckReady(User* user)
        {
                /* Users in CAP state get held until CAP END */
                if (user->GetExt("CAP_REGHOLD"))
-                       return true;
+                       return false;
 
-               return false;
+               return true;
        }
 
        virtual ~ModuleCAP()
@@ -113,7 +160,7 @@ class ModuleCAP : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
        }
 };