X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.cpp;h=6fc1584ec68c0331dc662966c8838bb53957b00b;hb=db7a49b071134cf3deadf05ce84fa6c7c46d80bf;hp=564ed594bd7189a2d9ddd644b2de3ab4cd38920d;hpb=83137d5f9274832f152acc7d19de3cb0897f9630;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 564ed594b..6fc1584ec 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -14,14 +14,21 @@
 #include "inspircd.h"
 #include "m_cap.h"
 
-/* $ModDesc: Provides a pointless /dalinfo command, demo module */
+/* $ModDesc: Provides the CAP negotiation mechanism seen in ratbox-derived ircds */
 
 /*
- *          std::string type;
- *                   std::vector<std::string> parameters;
- *                            User* user;
- *                                     Module* creator;
- */
+CAP LS
+:alfred.staticbox.net CAP * LS :multi-prefix sasl
+CAP REQ :multi-prefix
+:alfred.staticbox.net CAP * ACK :multi-prefix
+CAP CLEAR
+:alfred.staticbox.net CAP * ACK :-multi-prefix
+CAP REQ :multi-prefix
+:alfred.staticbox.net CAP * ACK :multi-prefix
+CAP LIST
+:alfred.staticbox.net CAP * LIST :multi-prefix
+CAP END
+*/
 
 /** Handle /CAP
  */
@@ -29,49 +36,96 @@ 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";
 	}
 
-	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		irc::string subcommand = parameters[0];
+		irc::string subcommand = parameters[0].c_str();
+
 		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 (parameters.size() < 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")
 		{
 			user->Shrink("CAP_REGHOLD");
 		}
-		else if (subcommand == "LS")
+		else if ((subcommand == "LS") || (subcommand == "LIST"))
 		{
 			CapData Data;
+
+			Data.type = subcommand;
+			Data.user = user;
+			Data.creator = this->Creator;
+
 			user->Extend("CAP_REGHOLD");
-			Data.type = "LS";
+			Event event((char*) &Data, (Module*)this->Creator, subcommand == "LS" ? "cap_ls" : "cap_list");
+			event.Send(this->ServerInstance);
+
+			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;
-			Data.parameter.clear();
 
-			Event event((char*) &Data, (Module*)this->Creator, "cap_ls");
+			user->Extend("CAP_REGHOLD");
+			Event event((char*) &Data, (Module*)this->Creator, "cap_clear");
 			event.Send(this->ServerInstance);
 
-			user->WriteServ("CAP * LS :%s", Data.parameter.c_str());
+			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(ERR_INVALIDCAPSUBCOMMAND, "* %s :Invalid CAP subcommand", subcommand.c_str());
 		}
+
 		return CMD_FAILURE;
 	}
 };
@@ -87,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()
@@ -106,7 +160,7 @@ class ModuleCAP : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 };