To be more specific, specify rpath() macro here

[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 43d0f2216d0edae3fc912481178f2ccea7e5aed3..2bb1b107a5b48a3efcc3ad04a0a133cd2dabfd0f 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -1,31 +1,35 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
 #include <stdlib.h>
 #include <string>
-#include "aes.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 
 /* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */
 
-extern InspIRCd* ServerInstance;
+
 
 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;
 }
 
@@ -41,13 +45,12 @@ class ModuleWaitPong : public Module
        ModuleWaitPong(InspIRCd* Me)
                : Module::Module(Me)
        {
-               
-               OnRehash("");
+               OnRehash(NULL,"");
        }
        
-       virtual void OnRehash(const std::string &param)
+       virtual void OnRehash(userrec* user, const std::string &param)
        {
-               Conf = new ConfigReader;
+               Conf = new ConfigReader(ServerInstance);
                
                sendsnotice = Conf->ReadFlag("waitpong", "sendsnotice", 0);
                
@@ -67,7 +70,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,9 +80,10 @@ 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)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line)
        {
                if(command == "PONG")
                {
@@ -146,7 +150,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);
        }
        
 };