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 5d4a9e94c797abde445697f9204bd003014164b6..37e2d760808e73de358175bc398d377ee691d5a4 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -1,51 +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 */
 
-static std::string 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]; 
 
-       to64frombits(out, tmp, (length/4)*3);
-       
-       std::string ret((char*)out);
 
-       delete out;
-       delete tmp;
-       
-       return ret;
+char* RandString(unsigned int length)
+{
+       unsigned char* out = new unsigned char[length+1];
+       for(unsigned int i = 0; i < length; i++)
+               out[i] = ((rand() % 26) + 65);
+       out[length] = '\0';
+
+       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(std::string param)
+       virtual void OnRehash(const std::string &param)
        {
-               Conf = new ConfigReader;
+               Conf = new ConfigReader(ServerInstance);
                
                sendsnotice = Conf->ReadFlag("waitpong", "sendsnotice", 0);
                
@@ -57,42 +66,48 @@ class ModuleWaitPong : public Module
                if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
                        killonbadreply = true;
                                
-               delete Conf;
+               DELETE(Conf);
        }
 
        void Implements(char* List)
        {
-               List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = List[I_OnPreCommand] = List[I_OnRehash] = 1;
+               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)
        {
-               std::string* pingrpl = new std::string;
-               *pingrpl = RandString(10);
+               char* pingrpl = RandString(10);
                
-               Srv->Send(user->fd, "PING :" + *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->c_str(), pingrpl->c_str());
+                       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", (char*)pingrpl);
+               user->Extend("waitpong_pingstr", pingrpl);
+               return 0;
        }
        
-       virtual int OnPreCommand(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")
                {
-                       std::string* pingrpl = (std::string*)user->GetExt("waitpong_pingstr");
+                       char* pingrpl;
+                       user->GetExt("waitpong_pingstr", pingrpl);
                        
-                       if(pingrpl && (*pingrpl == parameters[0]))
+                       if(pingrpl)
                        {
-                               delete pingrpl;
-                               user->Shrink("waitpong_pingstr");
-                               return 1;
-                       }
-                       else if(killonbadreply)
-                       {
-                               Srv->QuitUser(user, "Incorrect ping reply for registration");
+                               if(strcmp(pingrpl, parameters[0]) == 0)
+                               {
+                                       DELETE(pingrpl);
+                                       user->Shrink("waitpong_pingstr");
+                                       return 1;
+                               }
+                               else
+                               {
+                                       if(killonbadreply)
+                                               userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
+                                       return 1;
+                               }
                        }
                }
                
@@ -101,16 +116,45 @@ 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", pingrpl);
+
+               if(pingrpl)
+               {
+                       DELETE(pingrpl);
+                       user->Shrink("waitpong_pingstr");
+               }
+       }
+       
+       virtual void OnCleanup(int target_type, void* item)
+       {
+               if(target_type == TYPE_USER)
+               {
+                       userrec* user = (userrec*)item;
+                       char* pingrpl;
+                       user->GetExt("waitpong_pingstr", pingrpl);
+                       
+                       if(pingrpl)
+                       {
+                               DELETE(pingrpl);
+                               user->Shrink("waitpong_pingstr");
+                       } 
+               }
+       }
+       
        virtual ~ModuleWaitPong()
        {
        }
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_VENDOR);
+               return Version(1, 1, 0, 1, VF_VENDOR, API_VERSION);
        }
        
 };
@@ -126,7 +170,7 @@ class ModuleWaitPongFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleWaitPong(Me);
        }