* ---------------------------------------------------
*/
-#include <stdio.h>
-#include <string>
+#include "inspircd.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "inspircd.h"
-
/* $ModDesc: Provides support for the CHGHOST command */
/** Handle /CHGHOST
class cmd_chghost : public command_t
{
private:
- char*& hostmap;
+ char* hostmap;
public:
- cmd_chghost (InspIRCd* Instance, char* &hmap) : command_t(Instance,"CHGHOST",'o',2), hostmap(hmap)
+ cmd_chghost (InspIRCd* Instance, char* hmap) : command_t(Instance,"CHGHOST",'o',2), hostmap(hmap)
{
this->source = "m_chghost.so";
syntax = "<nick> <newhost>";
for (; *x; x++)
{
- if (!strchr(hostmap, *x))
+ if (!hostmap[(unsigned char)*x])
{
user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname");
return CMD_FAILURE;
return CMD_FAILURE;
}
userrec* dest = ServerInstance->FindNick(parameters[0]);
- if (dest)
+
+ if (!dest)
{
- if ((dest->ChangeDisplayedHost(parameters[1])) && (!ServerInstance->ULine(user->server)))
- {
- // fix by brain - ulines set hosts silently
- ServerInstance->WriteOpers(std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
- }
- return CMD_SUCCESS;
+ /* Drop it like a hot potato. XXX - we should probably message here.. -- w00t */
+ return CMD_FAILURE;
+ }
+
+ if ((dest->ChangeDisplayedHost(parameters[1])) && (!ServerInstance->ULine(user->server)))
+ {
+ // fix by brain - ulines set hosts silently
+ ServerInstance->WriteOpers(std::string(user->nick)+" used CHGHOST to make the displayed host of "+dest->nick+" become "+dest->dhost);
}
- return CMD_FAILURE;
+ /* route it! */
+ return CMD_SUCCESS;
+
}
};
class ModuleChgHost : public Module
{
cmd_chghost* mycommand;
- char* hostmap;
- std::string hmap;
+ char hostmap[256];
public:
ModuleChgHost(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
- OnRehash("");
+ OnRehash(NULL,"");
mycommand = new cmd_chghost(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;
}
~ModuleChgHost()
};
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
{
return new ModuleChgHostFactory;
}