Implement feature in bug #395 reported by stealth, and tidy up a bit

[user/henk/code/inspircd.git] / src / modules / m_sethost.cpp

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index 79fb9a42bcec17755a6b1568b42055d41d21723e..48c31d4e2811a06481b70d7355d56e0804d194d9 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -11,22 +11,21 @@
  * ---------------------------------------------------
  */
 
-#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 SETHOST command */
 
 /** Handle /SETHOST
  */
 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,15 +36,17 @@ 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 (!hostmap[(unsigned char)*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)+" :*** 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);
@@ -64,50 +65,44 @@ class cmd_sethost : public command_t
 
 class ModuleSetHost : public Module
 {
-       cmd_sethost*    mycommand;
+       cmd_sethost* mycommand;
+       char hostmap[256];
  public:
        ModuleSetHost(InspIRCd* Me)
-               : Module::Module(Me)
-       {
-               
-               mycommand = new cmd_sethost(ServerInstance);
+               : Module(Me)
+       {       
+               OnRehash(NULL,"");
+               mycommand = new cmd_sethost(ServerInstance, hostmap);
                ServerInstance->AddCommand(mycommand);
        }
-       
-       virtual ~ModuleSetHost()
+
+       void Implements(char* List)
        {
+               List[I_OnRehash] = 1;
        }
-       
-       virtual Version GetVersion()
+
+       void OnRehash(userrec* user, const std::string &parameter)
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-       }
-       
-};
+               ConfigReader Conf(ServerInstance);
+               std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
+               if (hmap.empty())
+                       hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
 
-class ModuleSetHostFactory : public ModuleFactory
-{
- public:
-       ModuleSetHostFactory()
-       {
+               memset(&hostmap, 0, 255);
+               for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
+                       hostmap[(unsigned char)*n] = 1;
        }
-       
-       ~ModuleSetHostFactory()
+
+       virtual ~ModuleSetHost()
        {
        }
        
-       virtual Module * CreateModule(InspIRCd* Me)
+       virtual Version GetVersion()
        {
-               return new ModuleSetHost(Me);
+               return Version(1, 1, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleSetHostFactory;
-}
-
+MODULE_INIT(ModuleSetHost)