diff options
| -rw-r--r-- | src/modules/m_chghost.cpp | 40 | ||||
| -rw-r--r-- | src/modules/m_sethost.cpp | 43 |
2 files changed, 55 insertions, 28 deletions
diff --git a/src/modules/m_chghost.cpp b/src/modules/m_chghost.cpp index a5e71ca87..3ce3d37bd 100644 --- a/src/modules/m_chghost.cpp +++ b/src/modules/m_chghost.cpp @@ -25,26 +25,25 @@ */ class cmd_chghost : public command_t { + private: + char*& hostmap; public: - cmd_chghost (InspIRCd* Instance) : command_t(Instance,"CHGHOST",'o',2) + cmd_chghost (InspIRCd* Instance, char* &hmap) : command_t(Instance,"CHGHOST",'o',2), hostmap(hmap) { this->source = "m_chghost.so"; syntax = "<nick> <newhost>"; } - + CmdResult Handle(const char** parameters, int pcnt, userrec *user) { const char * x = parameters[1]; for (; *x; x++) { - if (((tolower(*x) < 'a') || (tolower(*x) > 'z')) && (*x != '.')) + if (!strchr(hostmap, *x)) { - if (((*x < '0') || (*x > '9')) && (*x != '-')) - { - user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname"); - return CMD_FAILURE; - } + user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname"); + return CMD_FAILURE; } } if ((parameters[1] - x) > 63) @@ -71,31 +70,44 @@ class cmd_chghost : public command_t class ModuleChgHost : public Module { cmd_chghost* mycommand; + char* hostmap; + std::string hmap; public: ModuleChgHost(InspIRCd* Me) : Module::Module(Me) { - - mycommand = new cmd_chghost(ServerInstance); + OnRehash(""); + mycommand = new cmd_chghost(ServerInstance, hostmap); ServerInstance->AddCommand(mycommand); } void Implements(char* List) { + List[I_OnRehash] = 1; } - virtual ~ModuleChgHost() + void OnRehash(const std::string ¶meter) + { + ConfigReader Conf(ServerInstance); + hmap = Conf.ReadValue("hostname", "charmap", 0); + + if (hmap.empty()) + hostmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789"; + else + hostmap = (char*)hmap.c_str(); + } + + ~ModuleChgHost() { } - virtual Version GetVersion() + Version GetVersion() { - return Version(1,1,0,0,VF_VENDOR,API_VERSION); + return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION); } }; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. class ModuleChgHostFactory : public ModuleFactory { diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp index 79fb9a42b..f05d2c8a4 100644 --- a/src/modules/m_sethost.cpp +++ b/src/modules/m_sethost.cpp @@ -25,8 +25,10 @@ */ class cmd_sethost : public command_t { + private: + char*& hostmap; public: - cmd_sethost (InspIRCd* Instance) : command_t(Instance,"SETHOST",'o',1) + cmd_sethost (InspIRCd* Instance, char*& hmap) : command_t(Instance,"SETHOST",'o',1), hostmap(hmap) { this->source = "m_sethost.so"; syntax = "<new-hostname>"; @@ -37,13 +39,10 @@ class cmd_sethost : public command_t size_t len = 0; for (const char* x = parameters[0]; *x; x++, len++) { - if (((tolower(*x) < 'a') || (tolower(*x) > 'z')) && (*x != '.')) + if (!strchr(hostmap, *x)) { - if (((*x < '0') || (*x> '9')) && (*x != '-')) - { - user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname"); - return CMD_FAILURE; - } + user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Invalid characters in hostname"); + return CMD_FAILURE; } } if (len > 64) @@ -64,16 +63,34 @@ class cmd_sethost : public command_t class ModuleSetHost : public Module { - cmd_sethost* mycommand; + cmd_sethost* mycommand; + char* hostmap; + std::string hmap; public: ModuleSetHost(InspIRCd* Me) : Module::Module(Me) - { - - mycommand = new cmd_sethost(ServerInstance); + { + OnRehash(""); + mycommand = new cmd_sethost(ServerInstance, hostmap); ServerInstance->AddCommand(mycommand); } - + + void Implements(char* List) + { + List[I_OnRehash] = 1; + } + + void OnRehash(const std::string ¶meter) + { + ConfigReader Conf(ServerInstance); + hmap = Conf.ReadValue("hostname", "charmap", 0); + + if (hmap.empty()) + hostmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789"; + else + hostmap = (char*)hmap.c_str(); + } + virtual ~ModuleSetHost() { } @@ -85,8 +102,6 @@ class ModuleSetHost : public Module }; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - class ModuleSetHostFactory : public ModuleFactory { public: |