Convert more modules

[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 f05d2c8a45d4631adaede53f21b1e18d6e6e2ab8..1cacef956edb8f785c2ed386c427dccffb43e83a 100644 (file)
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -11,14 +11,11 @@
  * ---------------------------------------------------
  */
 
-#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
@@ -26,9 +23,9 @@
 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>";
@@ -39,7 +36,7 @@ class cmd_sethost : public command_t
                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;
@@ -64,13 +61,12 @@ class cmd_sethost : public command_t
 class ModuleSetHost : public Module
 {
        cmd_sethost* mycommand;
-       char* hostmap;
-       std::string hmap;
+       char hostmap[256];
  public:
        ModuleSetHost(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {       
-               OnRehash("");
+               OnRehash(NULL,"");
                mycommand = new cmd_sethost(ServerInstance, hostmap);
                ServerInstance->AddCommand(mycommand);
        }
@@ -80,15 +76,17 @@ class ModuleSetHost : public Module
                List[I_OnRehash] = 1;
        }
 
-       void OnRehash(const std::string &parameter)
+       void OnRehash(userrec* user, const std::string &parameter)
        {
                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()
@@ -121,7 +119,7 @@ class ModuleSetHostFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleSetHostFactory;
 }