]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_conn_waitpong.cpp
Remove InspIRCd* parameters and fields
[user/henk/code/inspircd.git] / src / modules / m_conn_waitpong.cpp
index 6021d70589ffd4db3d3f5842c3dfdf8978d594cc..46f4a69eb7605256ceb240330f1b19a158111adf 100644 (file)
-#include <stdlib.h>
-#include <string>
-#include "aes.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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.
+ *
+ * ---------------------------------------------------
+ */
+
 #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);
-       
-       out[length] = '\0';
-       
-       DELETE(tmp);
-       
-       return (char*)out;
-}
-
 class ModuleWaitPong : public Module
 {
-       Server* Srv;
-       ConfigReader* Conf;
-       
        bool sendsnotice;
        bool killonbadreply;
+       LocalStringExt ext;
 
  public:
-       ModuleWaitPong(Server* Me)
-               : Module::Module(Me)
+       ModuleWaitPong()
+        : ext("waitpong_pingstr", this)
        {
-               Srv = Me;
-               OnRehash("");
+               OnRehash(NULL);
+               Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
-       
-       virtual void OnRehash(const std::string &param)
+
+       void OnRehash(User* user)
        {
-               Conf = new ConfigReader;
-               
-               sendsnotice = Conf->ReadFlag("waitpong", "sendsnotice", 0);
-               
-               if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
+               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 = Conf.ReadFlag("waitpong", "killonbadreply", 0);
+
+               if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
                        killonbadreply = true;
-                               
-               DELETE(Conf);
        }
 
-       void Implements(char* List)
+       std::string RandString()
        {
-               List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 1;
+               char out[11];
+               for(unsigned int i = 0; i < 10; i++)
+                       out[i] = ((rand() % 26) + 65);
+               out[10] = '\0';
+
+               return out;
        }
 
-       virtual void OnUserRegister(userrec* 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("waitpong_pingstr", 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.c_str(), pingrpl.c_str());
+
+               ext.set(user, pingrpl);
+               return MOD_RES_PASSTHRU;
        }
-       
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated)
+
+       ModResult 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("waitpong_pingstr", pingrpl);
-                       
-                       if(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("waitpong_pingstr");
-                                       return 1;
+                                       ext.unset(user);
+                                       return MOD_RES_DENY;
                                }
                                else
                                {
                                        if(killonbadreply)
-                                               userrec::QuitUser(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(userrec* user)
+       ModResult OnCheckReady(User* user)
        {
-               char* pingrpl;
-               return (!user->GetExt("waitpong_pingstr", pingrpl));
+               return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
        }
-       
-       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()
+       ~ModuleWaitPong()
        {
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1, 0, 0, 1, VF_VENDOR);
-       }
-       
-};
 
-class ModuleWaitPongFactory : public ModuleFactory
-{
- public:
-       ModuleWaitPongFactory()
-       {
-       }
-       
-       ~ModuleWaitPongFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
+       Version GetVersion()
        {
-               return new ModuleWaitPong(Me);
+               return Version("Require pong prior to registration", VF_VENDOR);
        }
-};
 
+};
 
-extern "C" void * init_module( void )
-{
-       return new ModuleWaitPongFactory;
-}
+MODULE_INIT(ModuleWaitPong)