Remove InspIRCd* parameters and fields

[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 4c27efec2e6d5b1dcdf8b7e439f5fe03bfd330cc..46f4a69eb7605256ceb240330f1b19a158111adf 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -19,125 +19,93 @@ class ModuleWaitPong : public Module
 {
        bool sendsnotice;
        bool killonbadreply;
-       const char* extenstr;
+       LocalStringExt ext;
 
  public:
-       ModuleWaitPong(InspIRCd* Me)
-        : Module(Me), extenstr("waitpong_pingstr")
+       ModuleWaitPong()
+        : ext("waitpong_pingstr", this)
        {
-               OnRehash(NULL,"");
-               Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash, I_OnUserDisconnect, I_OnCleanup };
-               ServerInstance->Modules->Attach(eventlist, this, 6);
+               OnRehash(NULL);
+               Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
-       
-       virtual void OnRehash(User* user, const std::string &param)
+
+       void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
-               
+               ConfigReader Conf;
+
                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;
        }
 
-
-       char* RandString(unsigned int length)
+       std::string RandString()
        {
-               unsigned char* out = new unsigned char[length+1];
-               for(unsigned int i = 0; i < length; i++)
+               char out[11];
+               for(unsigned int i = 0; i < 10; i++)
                        out[i] = ((rand() % 26) + 65);
-               out[length] = '\0';
-       
-               return (char*)out;
+               out[10] = '\0';
+
+               return out;
        }
-       
-       virtual int OnUserRegister(User* user)
+
+       ModResult OnUserRegister(User* user)
        {
-               char* pingrpl = RandString(10);
-               
-               user->Write("PING :%s", pingrpl);
-               
+               std::string pingrpl = RandString();
+
+               user->Write("PING :%s", pingrpl.c_str());
+
                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->Extend(extenstr, pingrpl);
-               return 0;
+                       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.c_str(), pingrpl.c_str());
+
+               ext.set(user, pingrpl);
+               return MOD_RES_PASSTHRU;
        }
-       
-       virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User* user, bool validated, const std::string &original_line)
+
+       ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User* user, bool validated, const std::string &original_line)
        {
                if (command == "PONG")
                {
-                       char* pingrpl;
-                       user->GetExt(extenstr, pingrpl);
-                       
+                       std::string* pingrpl = ext.get(user);
+
                        if (pingrpl)
                        {
-                               if (strcmp(pingrpl, parameters[0]) == 0)
+                               if (!parameters.empty() && *pingrpl == parameters[0])
                                {
-                                       delete[] pingrpl;
-                                       user->Shrink(extenstr);
-                                       return 1;
+                                       ext.unset(user);
+                                       return MOD_RES_DENY;
                                }
                                else
                                {
                                        if(killonbadreply)
-                                               User::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
-                                       return 1;
+                                               ServerInstance->Users->QuitUser(user, "Incorrect ping reply for registration");
+                                       return MOD_RES_DENY;
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual bool OnCheckReady(User* user)
+       ModResult OnCheckReady(User* user)
        {
-               char* pingrpl;
-               return (!user->GetExt(extenstr, pingrpl));
+               return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
        }
-       
-       virtual void OnUserDisconnect(User* user)
-       {
-               char* pingrpl;
-               user->GetExt(extenstr, pingrpl);
 
-               if (pingrpl)
-               {
-                       delete[] pingrpl;
-                       user->Shrink(extenstr);
-               }
-       }
-       
-       virtual void OnCleanup(int target_type, void* item)
-       {
-               if (target_type == TYPE_USER)
-               {
-                       User* user = (User*)item;
-                       char* pingrpl;
-                       user->GetExt(extenstr, pingrpl);
-                       
-                       if (pingrpl)
-                       {
-                               delete[] pingrpl;
-                               user->Shrink(extenstr);
-                       } 
-               }
-       }
-       
-       virtual ~ModuleWaitPong()
+       ~ModuleWaitPong()
        {
        }
-       
-       virtual Version GetVersion()
+
+       Version GetVersion()
        {
-               return Version(1, 2, 0, 1, VF_VENDOR, API_VERSION);
+               return Version("Require pong prior to registration", VF_VENDOR);
        }
-       
+
 };
 
 MODULE_INIT(ModuleWaitPong)