* ---------------------------------------------------
*/
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-
#include "inspircd.h"
/* $ModDesc: Provides support for the SETHOST command */
/** Handle /SETHOST
*/
-class cmd_sethost : public command_t
+class CommandSethost : public Command
{
private:
- char*& hostmap;
+ char* hostmap;
public:
- cmd_sethost (InspIRCd* Instance, char*& hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap)
+ CommandSethost (InspIRCd* Instance, char* hmap) : Command(Instance,"SETHOST",'o',1), hostmap(hmap)
{
this->source = "m_sethost.so";
syntax = "<new-hostname>";
+ TRANSLATE2(TR_TEXT, TR_END);
}
- CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle (const char** parameters, int pcnt, User *user)
{
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");
+ user->WriteServ("NOTICE "+std::string(user->nick)+" :*** SETHOST: Invalid characters in hostname");
return CMD_FAILURE;
}
}
+ if (len == 0)
+ {
+ user->WriteServ("NOTICE %s :*** SETHOST: Host must be specified", user->nick);
+ return CMD_FAILURE;
+ }
if (len > 64)
{
user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
class ModuleSetHost : public Module
{
- cmd_sethost* mycommand;
- char* hostmap;
- std::string hmap;
+ CommandSethost* mycommand;
+ char hostmap[256];
public:
ModuleSetHost(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
- OnRehash("");
- mycommand = new cmd_sethost(ServerInstance, hostmap);
+ OnRehash(NULL,"");
+ mycommand = new CommandSethost(ServerInstance, hostmap);
ServerInstance->AddCommand(mycommand);
+ Implementation eventlist[] = { I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 1);
}
void Implements(char* List)
List[I_OnRehash] = 1;
}
- void OnRehash(const std::string ¶meter)
+ void OnRehash(User* 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()
virtual Version GetVersion()
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
}
};
-class ModuleSetHostFactory : public ModuleFactory
-{
- public:
- ModuleSetHostFactory()
- {
- }
-
- ~ModuleSetHostFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleSetHost(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleSetHostFactory;
-}
-
+MODULE_INIT(ModuleSetHost)