X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=a97fe8d3f717d63ee350778b6bf6d800584a9868;hb=3a7023f2c595d14778b3f1f7e53d3914698dd500;hp=ddbea55d03005efb6e3d5a772bf8822315da334f;hpb=3d9969c77286f85243002dd7f6e74f0bb74f34fa;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index ddbea55d0..a97fe8d3f 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -8,23 +8,22 @@
 
 /* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */
 
-static std::string RandString(unsigned int length)
+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];	
+	unsigned char* out = new unsigned char[length+1];
 
 	to64frombits(out, tmp, (length/4)*3);
 	
-	std::string ret((char*)out);
-
-	delete out;
-	delete tmp;
+	out[length] = '\0';
+	
+	DELETE(tmp);
 	
-	return ret;
+	return (char*)out;
 }
 
 class ModuleWaitPong : public Module
@@ -43,7 +42,7 @@ class ModuleWaitPong : public Module
 		OnRehash("");
 	}
 	
-	virtual void OnRehash(std::string param)
+	virtual void OnRehash(const std::string &param)
 	{
 		Conf = new ConfigReader;
 		
@@ -57,43 +56,47 @@ class ModuleWaitPong : public Module
 		if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
 			killonbadreply = true;
 				
-		delete Conf;
+		DELETE(Conf);
 	}
 
 	void Implements(char* List)
 	{
-		List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = 1;
+		List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 1;
 	}
 
 	virtual void OnUserRegister(userrec* user)
 	{
-		std::string* pingrpl = new std::string;
-		*pingrpl = RandString(10);
+		char* pingrpl = RandString(10);
 		
-		Srv->Send(user->fd, "PING :" + *pingrpl);
+		Write(user->fd, "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->c_str(), pingrpl->c_str());
+			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->Extend("waitpong_pingstr", (char*)pingrpl);
+		user->Extend("waitpong_pingstr", pingrpl);
 	}
 	
-	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)
 	{
 		if(command == "PONG")
 		{
-			std::string* pingrpl = (std::string*)user->GetExt("waitpong_pingstr");
+			char* pingrpl;
+			user->GetExt("waitpong_pingstr", pingrpl);
 			
-			if(pingrpl && (*pingrpl == parameters[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("waitpong_pingstr");
+					return 1;
+				}
+				else
+				{
+					if(killonbadreply)
+						Srv->QuitUser(user, "Incorrect ping reply for registration");
+					return 1;
+				}
 			}
 		}
 		
@@ -102,16 +105,45 @@ class ModuleWaitPong : public Module
 
 	virtual bool OnCheckReady(userrec* user)
 	{
-		return (!user->GetExt("waitpong_pingstr"));
+		char* pingrpl;
+		return (!user->GetExt("waitpong_pingstr", pingrpl));
 	}
-		
+	
+	virtual void OnUserDisconnect(userrec* user)
+	{
+		char* pingrpl;
+		user->GetExt("waitpong_pingstr", pingrpl);
+
+		if(pingrpl)
+		{
+			DELETE(pingrpl);
+			user->Shrink("waitpong_pingstr");
+		}
+	}
+	
+	virtual void OnCleanup(int target_type, void* item)
+	{
+		if(target_type == TYPE_USER)
+		{
+			userrec* user = (userrec*)item;
+			char* pingrpl;
+			user->GetExt("waitpong_pingstr", pingrpl);
+			
+			if(pingrpl)
+			{
+				DELETE(pingrpl);
+				user->Shrink("waitpong_pingstr");
+			} 
+		}
+	}
+	
 	virtual ~ModuleWaitPong()
 	{
 	}
 	
 	virtual Version GetVersion()
 	{
-		return Version(1, 0, 0, 0, VF_VENDOR);
+		return Version(1, 0, 0, 1, VF_VENDOR);
 	}
 	
 };