X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_cap.cpp;h=21b2e5a7c25b8f32de61c7cdd2f74cabe7dfee3f;hb=992674362c5f64bdb8e1942eeaa7612524529cd6;hp=ca2e861e29e3491d487da15147a1ce2279308c85;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp index ca2e861e2..21b2e5a7c 100644 --- a/src/modules/m_cap.cpp +++ b/src/modules/m_cap.cpp @@ -1,20 +1,25 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Craig Edwards * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * --------------------------------------------------- + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include "inspircd.h" -#include "m_cap.h" -/* $ModDesc: Provides the CAP negotiation mechanism seen in ratbox-derived ircds */ +#include "inspircd.h" +#include "modules/cap.h" /* CAP LS @@ -34,139 +39,105 @@ 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 std::vector ¶meters, User *user) { - /* Ignore CAP from registered clients */ - if (user->registered == REG_ALL) - return CMD_FAILURE; - irc::string subcommand = parameters[0].c_str(); if (subcommand == "REQ") { - CapData Data; - - Data.type = subcommand; - Data.user = user; - Data.creator = this->Creator; - if (parameters.size() < 2) return CMD_FAILURE; + CapEvent Data(creator, user, CapEvent::CAPEVENT_REQ); + // tokenize the input into a nice list of requested caps - std::string param = parameters[1]; std::string cap_; - irc::spacesepstream cap_stream(param); + irc::spacesepstream cap_stream(parameters[1]); 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); + 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()); + std::string AckResult = irc::stringjoiner(Data.ack).GetJoined(); + user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), 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()); + std::string NakResult = irc::stringjoiner(Data.wanted).GetJoined(); + user->WriteServ("CAP %s NAK :%s", user->nick.c_str(), NakResult.c_str()); } } else if (subcommand == "END") { - user->Shrink("CAP_REGHOLD"); + reghold.set(user, 0); } else if ((subcommand == "LS") || (subcommand == "LIST")) { - CapData Data; - - Data.type = subcommand; - Data.user = user; - Data.creator = this->Creator; + CapEvent Data(creator, user, subcommand == "LS" ? CapEvent::CAPEVENT_LS : CapEvent::CAPEVENT_LIST); - user->Extend("CAP_REGHOLD"); - Event event((char*) &Data, (Module*)this->Creator, subcommand == "LS" ? "cap_ls" : "cap_list"); - event.Send(this->ServerInstance); + reghold.set(user, 1); + Data.Send(); - 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()); + std::string Result = irc::stringjoiner(Data.wanted).GetJoined(); + user->WriteServ("CAP %s %s :%s", user->nick.c_str(), subcommand.c_str(), Result.c_str()); } else if (subcommand == "CLEAR") { - CapData Data; - - Data.type = subcommand; - Data.user = user; - Data.creator = this->Creator; + CapEvent Data(creator, user, CapEvent::CAPEVENT_CLEAR); - user->Extend("CAP_REGHOLD"); - Event event((char*) &Data, (Module*)this->Creator, "cap_clear"); - event.Send(this->ServerInstance); + reghold.set(user, 1); + Data.Send(); - std::string Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined(); - user->WriteServ("CAP * ACK :%s", Result.c_str()); + std::string Result = irc::stringjoiner(Data.ack).GetJoined(); + user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), Result.c_str()); } else { - user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "* %s :Invalid CAP subcommand", subcommand.c_str()); + user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "%s %s :Invalid CAP subcommand", user->nick.c_str(), subcommand.c_str()); + return CMD_FAILURE; } - return CMD_FAILURE; + return CMD_SUCCESS; } }; 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); - - Implementation eventlist[] = { I_OnCheckReady }; - ServerInstance->Modules->Attach(eventlist, this, 1); } - virtual bool OnCheckReady(User* user) + ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE { /* Users in CAP state get held until CAP END */ - if (user->GetExt("CAP_REGHOLD")) - return false; + if (cmd.reghold.get(user)) + return MOD_RES_DENY; - return true; + return MOD_RES_PASSTHRU; } - virtual ~ModuleCAP() + Version GetVersion() CXX11_OVERRIDE { - } - - virtual Version GetVersion() - { - return Version("$Id$", VF_VENDOR, API_VERSION); + return Version("Client CAP extension support", VF_VENDOR); } }; MODULE_INIT(ModuleCAP) -