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 353bd763f61d2b329a579972ae0e947a670d9487..37e2d760808e73de358175bc398d377ee691d5a4 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -1,50 +1,60 @@
+/*       +------------------------------------+
+ *       | 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"
-#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 */
 
+
+
 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;
 }
 
 class ModuleWaitPong : public Module
 {
-       Server* Srv;
+       
        ConfigReader* Conf;
        
        bool sendsnotice;
        bool killonbadreply;
 
  public:
-       ModuleWaitPong(Server* Me)
+       ModuleWaitPong(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
+               
                OnRehash("");
        }
        
        virtual void OnRehash(const std::string &param)
        {
-               Conf = new ConfigReader;
+               Conf = new ConfigReader(ServerInstance);
                
                sendsnotice = Conf->ReadFlag("waitpong", "sendsnotice", 0);
                
@@ -64,19 +74,20 @@ 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);
                
-               Write(user->fd, "PING :%s", pingrpl);
+               user->Write("PING :%s", pingrpl);
                
                if(sendsnotice)
-                       WriteServ(user->fd, "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->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, 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")
                {
@@ -94,7 +105,7 @@ class ModuleWaitPong : public Module
                                else
                                {
                                        if(killonbadreply)
-                                               Srv->QuitUser(user, "Incorrect ping reply for registration");
+                                               userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
                                        return 1;
                                }
                        }
@@ -143,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);
        }
        
 };
@@ -159,7 +170,7 @@ class ModuleWaitPongFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleWaitPong(Me);
        }