/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2013, 2017-2018, 2020 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
* Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- * Copyright (C) 2004-2006 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
*
* 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
*/
class CommandSethost : public Command
{
- char* hostmap;
-
public:
- CommandSethost(Module* Creator, char* hmap) : Command(Creator,"SETHOST", 1), hostmap(hmap)
+ std::bitset<UCHAR_MAX> hostmap;
+
+ CommandSethost(Module* Creator)
+ : Command(Creator,"SETHOST", 1)
{
allow_empty_last_param = false;
- flags_needed = 'o'; syntax = "<new-hostname>";
+ flags_needed = 'o';
+ syntax = "<host>";
}
- CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
+ CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
{
if (parameters[0].length() > ServerInstance->Config->Limits.MaxHost)
{
for (std::string::const_iterator x = parameters[0].begin(); x != parameters[0].end(); x++)
{
- if (!hostmap[(const unsigned char)*x])
+ if (!hostmap.test(static_cast<unsigned char>(*x)))
{
user->WriteNotice("*** SETHOST: Invalid characters in hostname");
return CMD_FAILURE;
class ModuleSetHost : public Module
{
CommandSethost cmd;
- char hostmap[256];
public:
ModuleSetHost()
- : cmd(this, hostmap)
+ : cmd(this)
{
}
void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
- std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789");
+ ConfigTag* tag = ServerInstance->Config->ConfValue("hostname");
+ const std::string hmap = tag->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789", 1);
- memset(hostmap, 0, sizeof(hostmap));
- for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
- hostmap[(unsigned char)*n] = 1;
+ cmd.hostmap.reset();
+ for (std::string::const_iterator n = hmap.begin(); n != hmap.end(); n++)
+ cmd.hostmap.set(static_cast<unsigned char>(*n));
}
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Provides support for the SETHOST command", VF_VENDOR);
+ return Version("Adds the /SETHOST command which allows server operators to change their displayed hostname.", VF_VENDOR);
}
};