*/
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>";
}
- CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+ CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
{
- size_t len = 0;
- for (std::string::const_iterator x = parameters[0].begin(); x != parameters[0].end(); x++, len++)
+ if (parameters[0].length() > ServerInstance->Config->Limits.MaxHost)
+ {
+ user->WriteNotice("*** SETHOST: Host too long");
+ return CMD_FAILURE;
+ }
+
+ 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;
}
}
- if (len > ServerInstance->Config->Limits.MaxHost)
- {
- user->WriteNotice("*** SETHOST: Host too long");
- return CMD_FAILURE;
- }
-
if (user->ChangeDisplayedHost(parameters[0]))
{
- ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SETHOST to change their displayed host to "+user->dhost);
+ ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SETHOST to change their displayed host to "+user->GetDisplayedHost());
return CMD_SUCCESS;
}
class ModuleSetHost : public Module
{
CommandSethost cmd;
- char hostmap[256];
public:
ModuleSetHost()
- : cmd(this, hostmap)
+ : cmd(this)
{
}
{
std::string hmap = ServerInstance->Config->ConfValue("hostname")->getString("charmap", "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<unsigned char>(*n));
}
Version GetVersion() CXX11_OVERRIDE