X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=937577c5ec2443e67b0758a5374943d0a9eb48cf;hb=7c0c957577a195b4819e4d7f2c9672d7c7522b0d;hp=a97fe8d3f717d63ee350778b6bf6d800584a9868;hpb=0757a4a495daabf661ac3b7ab79f0a5ee423abe8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index a97fe8d3f..937577c5e 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -4,10 +4,13 @@
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.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* tmp = new unsigned char[(length/4)*3];
@@ -28,23 +31,23 @@ char* RandString(unsigned int length)
 
 class ModuleWaitPong : public Module
 {
-	Server* Srv;
+	
 	ConfigReader* Conf;
 	
 	bool sendsnotice;
 	bool killonbadreply;
 
  public:
-	ModuleWaitPong(Server* Me)
+	ModuleWaitPong(InspIRCd* Me)
 		: Module::Module(Me)
 	{
-		Srv = Me;
+		
 		OnRehash("");
 	}
 	
 	virtual void OnRehash(const std::string &param)
 	{
-		Conf = new ConfigReader;
+		Conf = new ConfigReader(ServerInstance);
 		
 		sendsnotice = Conf->ReadFlag("waitpong", "sendsnotice", 0);
 		
@@ -68,10 +71,10 @@ class ModuleWaitPong : public Module
 	{
 		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);
 	}
@@ -94,7 +97,7 @@ class ModuleWaitPong : public Module
 				else
 				{
 					if(killonbadreply)
-						Srv->QuitUser(user, "Incorrect ping reply for registration");
+						userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
 					return 1;
 				}
 			}
@@ -159,7 +162,7 @@ class ModuleWaitPongFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		return new ModuleWaitPong(Me);
 	}