Tidyup

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

diff --git a/src/modules/m_opermd5.cpp b/src/modules/m_opermd5.cpp
index 166f166c4a2f49231fd4603c942bd0480656492b..e4d494ffc667dbdcc3341c11348e461b03a1fb80 100644 (file)
--- a/src/modules/m_opermd5.cpp
+++ b/src/modules/m_opermd5.cpp
@@ -26,7 +26,8 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* The four core functions - F1 is optimized somewhat */
 #define F1(x, y, z) (z ^ (x & (y ^ z)))
@@ -45,8 +46,11 @@ typedef unsigned int uint32_t;
 typedef uint32_t word32; /* NOT unsigned long. We don't support 16 bit platforms, anyway. */
 typedef unsigned char byte;
 
-clas MD5Context : public classbase
+/** An MD5 context, used by m_opermd5
+ */
+class MD5Context : public classbase
 {
+ public:
        word32 buf[4];
        word32 bytes[2];
        word32 in[16];
@@ -248,53 +252,51 @@ void MyMD5(void *dest, void *orig, int len)
 
 void GenHash(const char* src, char* dest)
 {
-       int i = 0;
        unsigned char bytes[16];
-       char hash[1024];
-       *hash = 0;
+       const char* xtab = "0123456789abcdef";
+
        MyMD5((char*)bytes,(void*)src,strlen(src));
-       for (i = 0; i < 16; i++)
+
+       for (int i = 0; i < 16; i++)
        {
-               const char* xtab = "0123456789abcdef";
-               unsigned char lo = xtab[bytes[i] % 16];
-               unsigned char hi = xtab[bytes[i] / 16];
-               char hx[3];
-               hx[0] = hi;
-               hx[1] = lo;
-               hx[2] = '\0';
-               strcat(hash,hx);
+               *dest++ = xtab[bytes[i] / 16];
+               *dest++ = xtab[bytes[i] % 16];
        }
-       strcpy(dest,hash);
+       *dest++ = 0;
 }
 
+/** Handle /MKPASSWD
+ */
 class cmd_mkpasswd : public command_t
 {
  public:
-       cmd_mkpasswd () : command_t("MKPASSWD", 'o', 1)
+       cmd_mkpasswd (InspIRCd* Instance) : command_t(Instance,"MKPASSWD", 'o', 1)
        {
                this->source = "m_opermd5.so";
+               syntax = "<any-text>";
        }
 
-       void Handle (char **parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                char buffer[MAXBUF];
                GenHash(parameters[0],buffer);
-               WriteServ(user->fd,"NOTICE %s :MD5 hashed password for %s is %s",user->nick,parameters[0],buffer);
+               user->WriteServ("NOTICE %s :MD5 hashed password for %s is %s",user->nick,parameters[0],buffer);
+               return CMD_SUCCESS;
        }
 };
 
 class ModuleOperMD5 : public Module
 {
-       Server* Srv;
+       
        cmd_mkpasswd* mycommand;
  public:
 
-       ModuleOperMD5(Server* Me)
+       ModuleOperMD5(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_mkpasswd();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_mkpasswd(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
        
        virtual ~ModuleOperMD5()
@@ -316,14 +318,14 @@ class ModuleOperMD5 : public Module
                        {
                                return 1;
                        }
-                       else return -1;
+                       else return 0;
                }
                return 0;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
 };
 
@@ -339,7 +341,7 @@ class ModuleOperMD5Factory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleOperMD5(Me);
        }