X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chghost.cpp;h=0ca7dc78c97e12d18b18d42c60222a29f34b6e7b;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=03347003ab0e25c99fb9b3ae58e058b0279fe9c6;hpb=537624cb910dfb4ff94d5668d2be972b89cccf73;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index 03347003a..0ca7dc78c 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -1,122 +1,110 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2004-2006 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 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" -/* $ModDesc: Provides support for the CHGHOST command */ +#include "inspircd.h" /** Handle /CHGHOST */ class CommandChghost : public Command { - private: - char* hostmap; public: - CommandChghost (InspIRCd* Instance, char* hmap) : Command(Instance,"CHGHOST","o",2), hostmap(hmap) + std::bitset hostmap; + + CommandChghost(Module* Creator) + : Command(Creator,"CHGHOST", 2) { - this->source = "m_chghost.so"; - syntax = " "; - TRANSLATE3(TR_NICK, TR_TEXT, TR_END); + allow_empty_last_param = false; + flags_needed = 'o'; + syntax = " "; + TRANSLATE2(TR_NICK, TR_TEXT); } - CmdResult Handle(const std::vector ¶meters, User *user) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - const char * x = parameters[1].c_str(); + if (parameters[1].length() > ServerInstance->Config->Limits.MaxHost) + { + user->WriteNotice("*** CHGHOST: Host too long"); + return CMD_FAILURE; + } - for (; *x; x++) + for (std::string::const_iterator x = parameters[1].begin(); x != parameters[1].end(); x++) { - if (!hostmap[(unsigned char)*x]) + if (!hostmap.test(static_cast(*x))) { - user->WriteServ("NOTICE "+std::string(user->nick)+" :*** CHGHOST: Invalid characters in hostname"); + user->WriteNotice("*** CHGHOST: Invalid characters in hostname"); return CMD_FAILURE; } } - if (parameters[1].empty()) - { - user->WriteServ("NOTICE %s :*** CHGHOST: Host must be specified", user->nick.c_str()); - return CMD_FAILURE; - } - if ((parameters[1].c_str() - x) > 63) - { - user->WriteServ("NOTICE %s :*** CHGHOST: Host too long", user->nick.c_str()); - return CMD_FAILURE; - } User* dest = ServerInstance->FindNick(parameters[0]); - if (!dest) + // Allow services to change the host of unregistered users + if ((!dest) || ((dest->registered != REG_ALL) && (!user->server->IsULine()))) { - user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameters[0].c_str()); + user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); return CMD_FAILURE; } if (IS_LOCAL(dest)) { - if ((dest->ChangeDisplayedHost(parameters[1].c_str())) && (!ServerInstance->ULine(user->server))) + if ((dest->ChangeDisplayedHost(parameters[1])) && (!user->server->IsULine())) { // fix by brain - ulines set hosts silently - ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost); + ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->GetDisplayedHost()); } - - /* ChangeDisplayedHost fixes it for us */ - return CMD_LOCALONLY; } - /* route it! */ return CMD_SUCCESS; + } + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE + { + return ROUTE_OPT_UCAST(parameters[0]); } }; class ModuleChgHost : public Module { - CommandChghost* mycommand; - char hostmap[256]; + CommandChghost cmd; + public: - ModuleChgHost(InspIRCd* Me) - : Module(Me) + ModuleChgHost() + : cmd(this) { - OnRehash(NULL,""); - mycommand = new CommandChghost(ServerInstance, hostmap); - ServerInstance->AddCommand(mycommand); - Implementation eventlist[] = { I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 1); } - - void OnRehash(User* user, const std::string ¶meter) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ConfigReader Conf(ServerInstance); - std::string hmap = Conf.ReadValue("hostname", "charmap", 0); + std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789"); - if (hmap.empty()) - hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789"; - - memset(hostmap, 0, sizeof(hostmap)); + cmd.hostmap.reset(); for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++) - hostmap[(unsigned char)*n] = 1; + cmd.hostmap.set(static_cast(*n)); } - ~ModuleChgHost() + Version GetVersion() CXX11_OVERRIDE { + return Version("Provides the CHGHOST command", VF_OPTCOMMON | VF_VENDOR); } - - Version GetVersion() - { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); - } - }; MODULE_INIT(ModuleChgHost)