]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_conn_waitpong.cpp
In the grand tradition of huge fucking commits:
[user/henk/code/inspircd.git] / src / modules / m_conn_waitpong.cpp
index a97fe8d3f717d63ee350778b6bf6d800584a9868..4ab3ed793de1ddc5f04a23aa7aba63455f6f7307 100644 (file)
@@ -1,62 +1,46 @@
-#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-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
-/* $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];
+#include "inspircd.h"
 
-       to64frombits(out, tmp, (length/4)*3);
-       
-       out[length] = '\0';
-       
-       DELETE(tmp);
-       
-       return (char*)out;
-}
+/* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */
 
 class ModuleWaitPong : public Module
 {
-       Server* Srv;
-       ConfigReader* Conf;
-       
        bool sendsnotice;
        bool killonbadreply;
+       const char* extenstr;
 
  public:
-       ModuleWaitPong(Server* Me)
-               : Module::Module(Me)
+       ModuleWaitPong(InspIRCd* Me)
+        : Module(Me), extenstr("waitpong_pingstr")
        {
-               Srv = Me;
-               OnRehash("");
+               OnRehash(NULL,"");
        }
        
-       virtual void OnRehash(const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
-               Conf = new ConfigReader;
+               ConfigReader Conf(ServerInstance);
                
-               sendsnotice = Conf->ReadFlag("waitpong", "sendsnotice", 0);
+               sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
                
-               if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
+               if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
                        sendsnotice = true;
                
-               killonbadreply = Conf->ReadFlag("waitpong", "killonbadreply", 0);
+               killonbadreply = Conf.ReadFlag("waitpong", "killonbadreply", 0);
 
-               if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
+               if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
                        killonbadreply = true;
-                               
-               DELETE(Conf);
        }
 
        void Implements(char* List)
@@ -64,75 +48,85 @@ class ModuleWaitPong : public Module
                List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 1;
        }
 
-       virtual void OnUserRegister(userrec* user)
+       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;
+       }
+       
+       virtual int OnUserRegister(User* user)
        {
                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);
+               user->Extend(extenstr, pingrpl);
+               return 0;
        }
        
-       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated)
+       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User* user, bool validated, const std::string &original_line)
        {
-               if(command == "PONG")
+               if (command == "PONG")
                {
                        char* pingrpl;
-                       user->GetExt("waitpong_pingstr", pingrpl);
+                       user->GetExt(extenstr, pingrpl);
                        
-                       if(pingrpl)
+                       if (pingrpl)
                        {
-                               if(strcmp(pingrpl, parameters[0]) == 0)
+                               if (strcmp(pingrpl, parameters[0]) == 0)
                                {
-                                       DELETE(pingrpl);
-                                       user->Shrink("waitpong_pingstr");
+                                       delete[] pingrpl;
+                                       user->Shrink(extenstr);
                                        return 1;
                                }
                                else
                                {
                                        if(killonbadreply)
-                                               Srv->QuitUser(user, "Incorrect ping reply for registration");
+                                               User::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
                                        return 1;
                                }
                        }
                }
-               
                return 0;
        }
 
-       virtual bool OnCheckReady(userrec* user)
+       virtual bool OnCheckReady(User* user)
        {
                char* pingrpl;
-               return (!user->GetExt("waitpong_pingstr", pingrpl));
+               return (!user->GetExt(extenstr, pingrpl));
        }
        
-       virtual void OnUserDisconnect(userrec* user)
+       virtual void OnUserDisconnect(User* user)
        {
                char* pingrpl;
-               user->GetExt("waitpong_pingstr", pingrpl);
+               user->GetExt(extenstr, pingrpl);
 
-               if(pingrpl)
+               if (pingrpl)
                {
-                       DELETE(pingrpl);
-                       user->Shrink("waitpong_pingstr");
+                       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("waitpong_pingstr", pingrpl);
+                       user->GetExt(extenstr, pingrpl);
                        
-                       if(pingrpl)
+                       if (pingrpl)
                        {
-                               DELETE(pingrpl);
-                               user->Shrink("waitpong_pingstr");
+                               delete[] pingrpl;
+                               user->Shrink(extenstr);
                        } 
                }
        }
@@ -143,30 +137,9 @@ 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);
        }
        
 };
 
-class ModuleWaitPongFactory : public ModuleFactory
-{
- public:
-       ModuleWaitPongFactory()
-       {
-       }
-       
-       ~ModuleWaitPongFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleWaitPong(Me);
-       }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleWaitPongFactory;
-}
+MODULE_INIT(ModuleWaitPong)