class cmd_sethost : public command_t
{
private:
- char*& hostmap;
+ char* hostmap;
public:
- cmd_sethost (InspIRCd* Instance, char*& hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap)
+ cmd_sethost (InspIRCd* Instance, char* hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap)
{
this->source = "m_sethost.so";
syntax = "<new-hostname>";
size_t len = 0;
for (const char* x = parameters[0]; *x; x++, len++)
{
- if (!strchr(hostmap, *x))
+ if (!hostmap[(unsigned char)*x])
{
user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
return CMD_FAILURE;
class ModuleSetHost : public Module
{
cmd_sethost* mycommand;
- char* hostmap;
- std::string hmap;
+ char hostmap[256];
public:
ModuleSetHost(InspIRCd* Me)
: Module::Module(Me)
{
- OnRehash("");
+ OnRehash(NULL,"");
mycommand = new cmd_sethost(ServerInstance, hostmap);
ServerInstance->AddCommand(mycommand);
}
List[I_OnRehash] = 1;
}
- void OnRehash(const std::string ¶meter)
+ void OnRehash(userrec* user, const std::string ¶meter)
{
ConfigReader Conf(ServerInstance);
- hmap = Conf.ReadValue("hostname", "charmap", 0);
+ std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
if (hmap.empty())
- hostmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
- else
- hostmap = (char*)hmap.c_str();
+ hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
+
+ memset(&hostmap, 0, 255);
+ for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
+ hostmap[(unsigned char)*n] = 1;
}
virtual ~ModuleSetHost()