Windows support. Tested and working to compile on freebsd and linux. Next step is...

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

diff --git a/src/modules/m_oper_hash.cpp b/src/modules/m_oper_hash.cpp
index f87f46be2507e3eba0a096dfe11e163066bb2c75..80869898cc0445fcc60efeb905ae90ab025c95aa 100644 (file)
--- a/src/modules/m_oper_hash.cpp
+++ b/src/modules/m_oper_hash.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -17,8 +14,6 @@
 /* $ModDesc: Allows for hashed oper passwords */
 /* $ModDep: m_hash.h */
 
-using namespace std;
-
 #include "inspircd_config.h"
 #include "users.h"
 #include "channels.h"
@@ -27,15 +22,17 @@ using namespace std;
 
 #include "m_hash.h"
 
+typedef std::map<irc::string, Module*> hashymodules;
+
 /* Handle /MKPASSWD
  */
 class cmd_mkpasswd : public command_t
 {
        Module* Sender;
-       std::map<irc::string, Module*> &hashers;
+       hashymodules &hashers;
        std::deque<std::string> &names;
  public:
-       cmd_mkpasswd (InspIRCd* Instance, Module* S, std::map<irc::string, Module*> &h, std::deque<std::string> &n)
+       cmd_mkpasswd (InspIRCd* Instance, Module* S, hashymodules &h, std::deque<std::string> &n)
                : command_t(Instance,"MKPASSWD", 'o', 2), Sender(S), hashers(h), names(n)
        {
                this->source = "m_oper_hash.so";
@@ -45,7 +42,7 @@ class cmd_mkpasswd : public command_t
        void MakeHash(userrec* user, const char* algo, const char* stuff)
        {
                /* Lets see if they gave us an algorithm which has been implemented */
-               std::map<irc::string, Module*>::iterator x = hashers.find(algo);
+               hashymodules::iterator x = hashers.find(algo);
                if (x != hashers.end())
                {
                        /* Yup, reset it first (Always ALWAYS do this) */
@@ -76,18 +73,20 @@ class ModuleOperHash : public Module
        
        cmd_mkpasswd* mycommand;
        ConfigReader* Conf;
-       std::map<irc::string, Module*> hashers; /* List of modules which implement HashRequest */
+       hashymodules hashers; /* List of modules which implement HashRequest */
        std::deque<std::string> names; /* Module names which implement HashRequest */
 
  public:
 
        ModuleOperHash(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
 
                /* Read the config file first */
                Conf = NULL;
-               OnRehash("");
+               OnRehash(NULL,"");
+
+               ServerInstance->UseInterface("HashRequest");
 
                /* Find all modules which implement the interface 'HashRequest' */
                modulelist* ml = ServerInstance->FindInterface("HashRequest");
@@ -105,7 +104,6 @@ class ModuleOperHash : public Module
                                /* Build a map of them */
                                hashers[name.c_str()] = *m;
                                names.push_back(name);
-                               ServerInstance->Log(DEBUG, "Found HashRequest interface: '%s' -> '%08x'", name.c_str(), *m);
                        }
                }
                else
@@ -119,6 +117,7 @@ class ModuleOperHash : public Module
        
        virtual ~ModuleOperHash()
        {
+               ServerInstance->DoneWithInterface("HashRequest");
        }
 
        void Implements(char* List)
@@ -126,7 +125,7 @@ class ModuleOperHash : public Module
                List[I_OnRehash] = List[I_OnOperCompare] = 1;
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                /* Re-read configuration file */
                if (Conf)
@@ -139,7 +138,7 @@ class ModuleOperHash : public Module
        {
                /* First, lets see what hash theyre using on this oper */
                std::string hashtype = Conf->ReadValue("oper", "hash", tagnumber);
-               std::map<irc::string, Module*>::iterator x = hashers.find(hashtype.c_str());
+               hashymodules::iterator x = hashers.find(hashtype.c_str());
 
                /* Is this a valid hash name? (case insensitive) */
                if (x != hashers.end())
@@ -183,7 +182,7 @@ class ModuleOperHashFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleOperHashFactory;
 }