X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=f271bfa03d8dfdcb62411f165adc5914c32216c3;hb=52acbb466b84a1cd161b1c111f855d6f0419fff3;hp=a97e7f72c53c05247327c63cc39f873c8511ea67;hpb=a3f476f7945fa2ea9c39e0429a5456366a6f8152;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index a97e7f72c..f271bfa03 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -1,62 +1,49 @@
-#include <stdlib.h>
-#include <string>
-#include "aes.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.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.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;
+	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(std::string param)
+	virtual void OnRehash(userrec* 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,53 +51,70 @@ 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(userrec* 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(std::string command, char** parameters, int pcnt,	userrec* user,	bool validated)
+	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line)
 	{
 		if(command == "PONG")
 		{
-			char* pingrpl = user->GetExt("waitpong_pingstr");
+			char* pingrpl;
+			user->GetExt(extenstr, pingrpl);
 			
-			if(pingrpl && (strcmp(pingrpl, parameters[0]) == 0))
-			{
-				delete pingrpl;
-				user->Shrink("waitpong_pingstr");
-				return 1;
-			}
-			else if(killonbadreply)
+			if(pingrpl)
 			{
-				Srv->QuitUser(user, "Incorrect ping reply for registration");
-				return 1;
+				if(strcmp(pingrpl, parameters[0]) == 0)
+				{
+					DELETE(pingrpl);
+					user->Shrink(extenstr);
+					return 1;
+				}
+				else
+				{
+					if(killonbadreply)
+						userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
+					return 1;
+				}
 			}
 		}
-		
 		return 0;
 	}
 
 	virtual bool OnCheckReady(userrec* user)
 	{
-		return (!user->GetExt("waitpong_pingstr"));
+		char* pingrpl;
+		return (!user->GetExt(extenstr, pingrpl));
 	}
 	
 	virtual void OnUserDisconnect(userrec* user)
 	{
-		char* pingrpl = user->GetExt("waitpong_pingstr");
+		char* pingrpl;
+		user->GetExt(extenstr, pingrpl);
 
 		if(pingrpl)
 		{
-			delete pingrpl;
-			user->Shrink("waitpong_pingstr");
+			DELETE(pingrpl);
+			user->Shrink(extenstr);
 		}
 	}
 	
@@ -119,12 +123,13 @@ class ModuleWaitPong : public Module
 		if(target_type == TYPE_USER)
 		{
 			userrec* user = (userrec*)item;
-			char* pingrpl = user->GetExt("waitpong_pingstr");
+			char* pingrpl;
+			user->GetExt(extenstr, pingrpl);
 			
 			if(pingrpl)
 			{
-				delete pingrpl;
-				user->Shrink("waitpong_pingstr");
+				DELETE(pingrpl);
+				user->Shrink(extenstr);
 			} 
 		}
 	}
@@ -135,7 +140,7 @@ 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);
 	}
 	
 };
@@ -151,14 +156,14 @@ class ModuleWaitPongFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleWaitPong(Me);
 	}
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleWaitPongFactory;
 }