X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_opermd5.cpp;h=9ac896e81e709a178554379a9094d746f68f29a5;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=42683ac19a6c7b55eca7ee9254a247982cbc4b76;hpb=981ca37d6641404548a13623b90438f8f1c87ded;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_opermd5.cpp b/src/modules/m_opermd5.cpp
index 42683ac19..9ac896e81 100644
--- a/src/modules/m_opermd5.cpp
+++ b/src/modules/m_opermd5.cpp
@@ -19,11 +19,15 @@
 using namespace std;
 
 #include <stdio.h>
+#include "inspircd_config.h"
+#ifdef HAS_STDINT
+#include <stdint.h>
+#endif
 #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)))
@@ -35,10 +39,16 @@ using namespace std;
 #define MD5STEP(f,w,x,y,z,in,s) \
          (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
 
-typedef unsigned long word32;
+#ifndef HAS_STDINT
+typedef unsigned int uint32_t;
+#endif
+
+typedef uint32_t word32; /* NOT unsigned long. We don't support 16 bit platforms, anyway. */
 typedef unsigned char byte;
 
-struct MD5Context {
+class MD5Context : public classbase
+{
+ public:
 	word32 buf[4];
 	word32 bytes[2];
 	word32 in[16];
@@ -262,31 +272,32 @@ void GenHash(const char* src, char* dest)
 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)
+	void 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);
 	}
 };
 
 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()
@@ -331,7 +342,7 @@ class ModuleOperMD5Factory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleOperMD5(Me);
 	}