X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.cpp;h=2c7e58e6aa0e61840b0f37c5de23daebc57ee24b;hb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;hp=df11f1d32636559261ffe62fe9bcf08e48ffa6eb;hpb=90c5531101dedb1825bd8192d3b5ea4c810eee06;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index df11f1d32..2c7e58e6a 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -20,11 +20,11 @@
 CAP LS
 :alfred.staticbox.net CAP * LS :multi-prefix sasl
 CAP REQ :multi-prefix
-:alfred.staticbox.net CAP * ACK :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 
+:alfred.staticbox.net CAP * ACK :multi-prefix
 CAP LIST
 :alfred.staticbox.net CAP * LIST :multi-prefix
 CAP END
@@ -34,68 +34,94 @@ CAP END
  */
 class CommandCAP : public Command
 {
-	Module* Creator;
  public:
-	CommandCAP (InspIRCd* Instance, Module* mod) : Command(Instance,"CAP", 0, 1, true), Creator(mod)
+	LocalIntExt reghold;
+	CommandCAP (Module* mod) : Command(mod, "CAP", 1),
+		reghold("CAP_REGHOLD", mod)
 	{
-		this->source = "m_cap.so";
+		works_before_reg = true;
 	}
 
-	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.user = user;
-			Data.creator = this->Creator;
-			Data.parameter = (pcnt > 1 ? parameters[1] : "");
-
-			user->Extend("CAP_REGHOLD");
-			Event event((char*) &Data, (Module*)this->Creator, "cap_req");
-			event.Send(this->ServerInstance);
+			CapEvent Data(creator, "cap_req");
 
-			user->WriteServ("CAP * ACK :%s", Data.parameter.c_str());
+			Data.type = subcommand;
+			Data.user = user;
+			Data.creator = this->creator;
+
+			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_);
+			}
+
+			reghold.set(user, 1);
+			Data.Send();
+
+			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");
+			reghold.set(user, 0);
 		}
 		else if ((subcommand == "LS") || (subcommand == "LIST"))
 		{
-			CapData Data;
+			CapEvent Data(creator, subcommand == "LS" ? "cap_ls" : "cap_list");
 
 			Data.type = subcommand;
 			Data.user = user;
-			Data.creator = this->Creator;
-			Data.parameter.clear();
+			Data.creator = this->creator;
+
+			reghold.set(user, 1);
+			Data.Send();
 
-			user->Extend("CAP_REGHOLD");
-			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 * LS :%s", Data.parameter.c_str());
+			user->WriteServ("CAP * %s :%s", subcommand.c_str(), Result.c_str());
 		}
 		else if (subcommand == "CLEAR")
 		{
-			CapData Data;
+			CapEvent Data(creator, "cap_clear");
 
 			Data.type = subcommand;
 			Data.user = user;
-			Data.creator = this->Creator;
-			Data.parameter.clear();
+			Data.creator = this->creator;
 
-			user->Extend("CAP_REGHOLD");
-			Event event((char*) &Data, (Module*)this->Creator, "cap_clear");
-			event.Send(this->ServerInstance);
+			reghold.set(user, 1);
+			Data.Send();
 
-			user->WriteServ("CAP * ACK :%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 :Invalid CAP subcommand", subcommand.c_str());
+			user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "* %s :Invalid CAP subcommand", subcommand.c_str());
 		}
 
 		return CMD_FAILURE;
@@ -104,35 +130,34 @@ class CommandCAP : public Command
 
 class ModuleCAP : public Module
 {
-	CommandCAP* newcommand;
+	CommandCAP cmd;
  public:
-	ModuleCAP(InspIRCd* Me)
-		: Module(Me)
+	ModuleCAP()
+		: cmd(this)
 	{
-		// Create a new command
-		newcommand = new CommandCAP(ServerInstance, this);
-		ServerInstance->AddCommand(newcommand);
+		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Extensions.Register(&cmd.reghold);
 
-		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)
+	ModResult OnCheckReady(User* user)
 	{
 		/* Users in CAP state get held until CAP END */
-		if (user->GetExt("CAP_REGHOLD"))
-			return true;
+		if (cmd.reghold.get(user))
+			return MOD_RES_DENY;
 
-		return false;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleCAP()
+	~ModuleCAP()
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("Client CAP extension support", VF_VENDOR);
 	}
 };