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

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 58eb3b5c3..f271bfa03 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -11,41 +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 */
 
-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;
-}
-
 class ModuleWaitPong : public Module
 {
-	InspIRCd* Instance;
 	bool sendsnotice;
 	bool killonbadreply;
+	const char* extenstr;
 
  public:
 	ModuleWaitPong(InspIRCd* Me)
-	 : Module::Module(Me), Instance(Me)
+	 : 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);
 		
@@ -63,6 +51,16 @@ class ModuleWaitPong : public Module
 		List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 1;
 	}
 
+	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);
@@ -72,7 +70,7 @@ class ModuleWaitPong : public Module
 		if(sendsnotice)
 			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;
 	}
 	
@@ -81,14 +79,14 @@ class ModuleWaitPong : public Module
 		if(command == "PONG")
 		{
 			char* pingrpl;
-			user->GetExt("waitpong_pingstr", pingrpl);
+			user->GetExt(extenstr, pingrpl);
 			
 			if(pingrpl)
 			{
 				if(strcmp(pingrpl, parameters[0]) == 0)
 				{
 					DELETE(pingrpl);
-					user->Shrink("waitpong_pingstr");
+					user->Shrink(extenstr);
 					return 1;
 				}
 				else
@@ -99,25 +97,24 @@ class ModuleWaitPong : public Module
 				}
 			}
 		}
-		
 		return 0;
 	}
 
 	virtual bool OnCheckReady(userrec* user)
 	{
 		char* pingrpl;
-		return (!user->GetExt("waitpong_pingstr", pingrpl));
+		return (!user->GetExt(extenstr, pingrpl));
 	}
 	
 	virtual void OnUserDisconnect(userrec* user)
 	{
 		char* pingrpl;
-		user->GetExt("waitpong_pingstr", pingrpl);
+		user->GetExt(extenstr, pingrpl);
 
 		if(pingrpl)
 		{
 			DELETE(pingrpl);
-			user->Shrink("waitpong_pingstr");
+			user->Shrink(extenstr);
 		}
 	}
 	
@@ -127,12 +124,12 @@ class ModuleWaitPong : public Module
 		{
 			userrec* user = (userrec*)item;
 			char* pingrpl;
-			user->GetExt("waitpong_pingstr", pingrpl);
+			user->GetExt(extenstr, pingrpl);
 			
 			if(pingrpl)
 			{
 				DELETE(pingrpl);
-				user->Shrink("waitpong_pingstr");
+				user->Shrink(extenstr);
 			} 
 		}
 	}
@@ -166,7 +163,7 @@ class ModuleWaitPongFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
 	return new ModuleWaitPongFactory;
 }