X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=0dd27ddbd4f196494f7b02f8629aedc2ceefb722;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;hp=d7a4b833a02daa9349d64b5f705557a01e2202f9;hpb=ad8705d3f051e98b24ba404fcdd888acd30e13db;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index d7a4b833a..0dd27ddbd 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -11,32 +11,29 @@
  * ---------------------------------------------------
  */
 
-#include <stdlib.h>
-#include <string>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "inspircd.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::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);
 		
@@ -81,37 +78,30 @@ class ModuleWaitPong : public Module
 	{
 		if(command == "PONG")
 		{
-			ServerInstance->Log(DEBUG,"PONG command");
 			char* pingrpl;
 			user->GetExt(extenstr, pingrpl);
 			
 			if(pingrpl)
 			{
-				ServerInstance->Log(DEBUG,"PONG command - has extend");
 				if(strcmp(pingrpl, parameters[0]) == 0)
 				{
-					ServerInstance->Log(DEBUG,"PONG command - pong matches ping ");
 					DELETE(pingrpl);
 					user->Shrink(extenstr);
 					return 1;
 				}
 				else
 				{
-					ServerInstance->Log(DEBUG,"PONG command - pong doesnt match ping");
 					if(killonbadreply)
 						userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
 					return 1;
 				}
 			}
 		}
-		
-		ServerInstance->Log(DEBUG,"PONG command - fall through");
 		return 0;
 	}
 
 	virtual bool OnCheckReady(userrec* user)
 	{
-		ServerInstance->Log(DEBUG,"PONG command - oncheckready");
 		char* pingrpl;
 		return (!user->GetExt(extenstr, pingrpl));
 	}
@@ -155,25 +145,4 @@ class ModuleWaitPong : public Module
 	
 };
 
-class ModuleWaitPongFactory : public ModuleFactory
-{
- public:
-	ModuleWaitPongFactory()
-	{
-	}
-	
-	~ModuleWaitPongFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleWaitPong(Me);
-	}
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleWaitPongFactory;
-}
+MODULE_INIT(ModuleWaitPong)