Send SVSNICKs during nick collision to prevent servers that do not fully implement...

[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 0dd27ddbd4f196494f7b02f8629aedc2ceefb722..71927a7f10ac034bb66cfb974be98b6a4d3e6185 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */
 
@@ -29,27 +26,25 @@ class ModuleWaitPong : public Module
         : Module(Me), extenstr("waitpong_pingstr")
        {
                OnRehash(NULL,"");
+               Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash, I_OnUserDisconnect, I_OnCleanup };
+               ServerInstance->Modules->Attach(eventlist, this, 6);
        }
-       
-       virtual void OnRehash(userrec* user, const std::string &param)
+
+       virtual void OnRehash(User* user, const std::string &param)
        {
                ConfigReader Conf(ServerInstance);
-               
+
                sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
-               
+
                if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
                        sendsnotice = true;
-               
+
                killonbadreply = Conf.ReadFlag("waitpong", "killonbadreply", 0);
 
                if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
                        killonbadreply = true;
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 1;
-       }
 
        char* RandString(unsigned int length)
        {
@@ -57,42 +52,42 @@ class ModuleWaitPong : public Module
                for(unsigned int i = 0; i < length; i++)
                        out[i] = ((rand() % 26) + 65);
                out[length] = '\0';
-       
+
                return (char*)out;
        }
-       
-       virtual int OnUserRegister(userrec* user)
+
+       virtual int OnUserRegister(User* user)
        {
                char* pingrpl = RandString(10);
-               
+
                user->Write("PING :%s", pingrpl);
-               
+
                if(sendsnotice)
-                       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->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.c_str(), pingrpl, pingrpl);
+
                user->Extend(extenstr, pingrpl);
                return 0;
        }
-       
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line)
+
+       virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User* user, bool validated, const std::string &original_line)
        {
-               if(command == "PONG")
+               if (command == "PONG")
                {
                        char* pingrpl;
                        user->GetExt(extenstr, pingrpl);
-                       
-                       if(pingrpl)
+
+                       if (pingrpl)
                        {
-                               if(strcmp(pingrpl, parameters[0]) == 0)
+                               if (!parameters.empty() && (strcmp(pingrpl, parameters[0].c_str()) == 0))
                                {
-                                       DELETE(pingrpl);
+                                       delete[] pingrpl;
                                        user->Shrink(extenstr);
                                        return 1;
                                }
                                else
                                {
                                        if(killonbadreply)
-                                               userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
+                                               ServerInstance->Users->QuitUser(user, "Incorrect ping reply for registration");
                                        return 1;
                                }
                        }
@@ -100,49 +95,49 @@ class ModuleWaitPong : public Module
                return 0;
        }
 
-       virtual bool OnCheckReady(userrec* user)
+       virtual bool OnCheckReady(User* user)
        {
                char* pingrpl;
                return (!user->GetExt(extenstr, pingrpl));
        }
-       
-       virtual void OnUserDisconnect(userrec* user)
+
+       virtual void OnUserDisconnect(User* user)
        {
                char* pingrpl;
                user->GetExt(extenstr, pingrpl);
 
-               if(pingrpl)
+               if (pingrpl)
                {
-                       DELETE(pingrpl);
+                       delete[] pingrpl;
                        user->Shrink(extenstr);
                }
        }
-       
+
        virtual void OnCleanup(int target_type, void* item)
        {
-               if(target_type == TYPE_USER)
+               if (target_type == TYPE_USER)
                {
-                       userrec* user = (userrec*)item;
+                       User* user = (User*)item;
                        char* pingrpl;
                        user->GetExt(extenstr, pingrpl);
-                       
-                       if(pingrpl)
+
+                       if (pingrpl)
                        {
-                               DELETE(pingrpl);
+                               delete[] pingrpl;
                                user->Shrink(extenstr);
-                       } 
+                       }
                }
        }
-       
+
        virtual ~ModuleWaitPong()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 1, VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleWaitPong)