Added <oper:swhois> to m_swhois, which will override <type:swhois> if specified

[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 f67021af5d7ab493c7d665f218dea602354af4f1..1806a988f68a4260a00f4d004b2895bcf4bea41f 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -4,10 +4,13 @@
 #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];
@@ -21,30 +24,30 @@ char* RandString(unsigned int length)
        
        out[length] = '\0';
        
-       delete tmp;
+       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);
                
@@ -56,7 +59,7 @@ class ModuleWaitPong : public Module
                if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
                        killonbadreply = true;
                                
-               delete Conf;
+               DELETE(Conf);
        }
 
        void Implements(char* List)
@@ -68,32 +71,33 @@ class ModuleWaitPong : public Module
        {
                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);
        }
        
-       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")
                {
-                       char* pingrpl = user->GetExt("waitpong_pingstr");
+                       char* pingrpl;
+                       user->GetExt("waitpong_pingstr", pingrpl);
                        
                        if(pingrpl)
                        {
                                if(strcmp(pingrpl, parameters[0]) == 0)
                                {
-                                       delete pingrpl;
+                                       DELETE(pingrpl);
                                        user->Shrink("waitpong_pingstr");
                                        return 1;
                                }
                                else
                                {
                                        if(killonbadreply)
-                                               Srv->QuitUser(user, "Incorrect ping reply for registration");
+                                               userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
                                        return 1;
                                }
                        }
@@ -104,16 +108,18 @@ class ModuleWaitPong : public Module
 
        virtual bool OnCheckReady(userrec* user)
        {
-               return (!user->GetExt("waitpong_pingstr"));
+               char* pingrpl;
+               return (!user->GetExt("waitpong_pingstr", pingrpl));
        }
        
        virtual void OnUserDisconnect(userrec* user)
        {
-               char* pingrpl = user->GetExt("waitpong_pingstr");
+               char* pingrpl;
+               user->GetExt("waitpong_pingstr", pingrpl);
 
                if(pingrpl)
                {
-                       delete pingrpl;
+                       DELETE(pingrpl);
                        user->Shrink("waitpong_pingstr");
                }
        }
@@ -123,11 +129,12 @@ class ModuleWaitPong : public Module
                if(target_type == TYPE_USER)
                {
                        userrec* user = (userrec*)item;
-                       char* pingrpl = user->GetExt("waitpong_pingstr");
+                       char* pingrpl;
+                       user->GetExt("waitpong_pingstr", pingrpl);
                        
                        if(pingrpl)
                        {
-                               delete pingrpl;
+                               DELETE(pingrpl);
                                user->Shrink("waitpong_pingstr");
                        } 
                }
@@ -139,7 +146,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);
        }
        
 };
@@ -155,7 +162,7 @@ class ModuleWaitPongFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleWaitPong(Me);
        }