Fix potential for duplicate SID if the SID is auto generated.

[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 20d20bd7c900ec8b96d8b5e1f2f2416ceebe077d..51571072e6a18727061a84802ec79f40dde854fa 100644 (file)
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -12,29 +12,25 @@
  */
 
 #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 */
 
 class ModuleWaitPong : public Module
 {
-       InspIRCd* Instance;
        bool sendsnotice;
        bool killonbadreply;
        const char* extenstr;
 
  public:
        ModuleWaitPong(InspIRCd* Me)
-        : Module(Me), Instance(Me), extenstr("waitpong_pingstr")
+        : Module(Me), extenstr("waitpong_pingstr")
        {
                OnRehash(NULL,"");
        }
        
        virtual void OnRehash(userrec* user, const std::string &param)
        {
-               ConfigReader Conf(Instance);
+               ConfigReader Conf(ServerInstance);
                
                sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
                
@@ -146,25 +142,4 @@ class ModuleWaitPong : public Module
        
 };
 
-class ModuleWaitPongFactory : public ModuleFactory
-{
- public:
-       ModuleWaitPongFactory()
-       {
-       }
-       
-       ~ModuleWaitPongFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleWaitPong(Me);
-       }
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleWaitPongFactory;
-}
+MODULE_INIT(ModuleWaitPong)