This is better now.

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

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 346555a1d386eb42ead9cc26f78fa3d3870dbb57..37e2d760808e73de358175bc398d377ee691d5a4 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -1,6 +1,21 @@
+/*       +------------------------------------+
+ *       | 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.
+ * This program is free but copyrighted software; see
+ *           the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include <stdlib.h>
 #include <string>
-#include "aes.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
@@ -13,19 +28,11 @@
 
 char* RandString(unsigned int length)
 {
-       unsigned char* tmp = new unsigned char[(length/4)*3];
-       
-       for(unsigned int i = 0; i < (length/4)*3; i++)
-               tmp[i] = (unsigned char)rand();
-               
        unsigned char* out = new unsigned char[length+1];
-
-       to64frombits(out, tmp, (length/4)*3);
-       
+       for(unsigned int i = 0; i < length; i++)
+               out[i] = ((rand() % 26) + 65);
        out[length] = '\0';
-       
-       DELETE(tmp);
-       
+
        return (char*)out;
 }
 
@@ -67,7 +74,7 @@ class ModuleWaitPong : public Module
                List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 1;
        }
 
-       virtual void OnUserRegister(userrec* user)
+       virtual int OnUserRegister(userrec* user)
        {
                char* pingrpl = RandString(10);
                
@@ -77,6 +84,7 @@ class ModuleWaitPong : public Module
                        user->WriteServ("NOTICE %s :*** If you are having problems connecting due to ping timeouts, please type /quote PONG %s or /raw PONG %s now.", user->nick, pingrpl, pingrpl);
                        
                user->Extend("waitpong_pingstr", pingrpl);
+               return 0;
        }
        
        virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line)
@@ -146,7 +154,7 @@ class ModuleWaitPong : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 1, VF_VENDOR);
+               return Version(1, 1, 0, 1, VF_VENDOR, API_VERSION);
        }
        
 };