X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=4c27efec2e6d5b1dcdf8b7e439f5fe03bfd330cc;hb=89fc6ca9c66198fe54cce19d59279cd454fc1bd0;hp=e6e6456ff419b160863f9bfdac47b0914ca5f20f;hpb=65735fefd6022aefa1a2d9d4fbcc72dda25ac5b5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index e6e6456ff..4c27efec2 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,32 +11,28 @@
  * ---------------------------------------------------
  */
 
-#include <stdlib.h>
-#include <string>
-#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,"");
+		Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash, I_OnUserDisconnect, I_OnCleanup };
+		ServerInstance->Modules->Attach(eventlist, this, 6);
 	}
 	
-	virtual void OnRehash(userrec* user, const std::string &param)
+	virtual void OnRehash(User* user, const std::string &param)
 	{
-		ConfigReader Conf(Instance);
+		ConfigReader Conf(ServerInstance);
 		
 		sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
 		
@@ -49,10 +45,6 @@ class ModuleWaitPong : public Module
 			killonbadreply = true;
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 1;
-	}
 
 	char* RandString(unsigned int length)
 	{
@@ -64,7 +56,7 @@ class ModuleWaitPong : public Module
 		return (char*)out;
 	}
 	
-	virtual int OnUserRegister(userrec* user)
+	virtual int OnUserRegister(User* user)
 	{
 		char* pingrpl = RandString(10);
 		
@@ -77,62 +69,61 @@ class ModuleWaitPong : public Module
 		return 0;
 	}
 	
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User* user, bool validated, const std::string &original_line)
 	{
-		if(command == "PONG")
+		if (command == "PONG")
 		{
 			char* pingrpl;
 			user->GetExt(extenstr, pingrpl);
 			
-			if(pingrpl)
+			if (pingrpl)
 			{
-				if(strcmp(pingrpl, parameters[0]) == 0)
+				if (strcmp(pingrpl, parameters[0]) == 0)
 				{
-					DELETE(pingrpl);
+					delete[] pingrpl;
 					user->Shrink(extenstr);
 					return 1;
 				}
 				else
 				{
 					if(killonbadreply)
-						userrec::QuitUser(ServerInstance, 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(extenstr, pingrpl));
 	}
 	
-	virtual void OnUserDisconnect(userrec* user)
+	virtual void OnUserDisconnect(User* user)
 	{
 		char* pingrpl;
 		user->GetExt(extenstr, pingrpl);
 
-		if(pingrpl)
+		if (pingrpl)
 		{
-			DELETE(pingrpl);
+			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(extenstr, pingrpl);
 			
-			if(pingrpl)
+			if (pingrpl)
 			{
-				DELETE(pingrpl);
+				delete[] pingrpl;
 				user->Shrink(extenstr);
 			} 
 		}
@@ -144,30 +135,9 @@ class ModuleWaitPong : public Module
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 1, VF_VENDOR, API_VERSION);
+		return Version(1, 2, 0, 1, VF_VENDOR, API_VERSION);
 	}
 	
 };
 
-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)