X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=46f4a69eb7605256ceb240330f1b19a158111adf;hb=78aabc62e7510af5075b2056f703f0aa42e328a4;hp=d6694d107d5603d17e92d001c037cd4adfd7e3aa;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index d6694d107..46f4a69eb 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -19,20 +19,20 @@ class ModuleWaitPong : public Module
 {
 	bool sendsnotice;
 	bool killonbadreply;
-	const char* extenstr;
+	LocalStringExt ext;
 
  public:
-	ModuleWaitPong(InspIRCd* Me)
-	 : Module(Me), extenstr("waitpong_pingstr")
+	ModuleWaitPong()
+	 : ext("waitpong_pingstr", this)
 	{
-		OnRehash(NULL,"");
-		Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash, I_OnUserDisconnect, I_OnCleanup };
-		ServerInstance->Modules->Attach(eventlist, this, 6);
+		OnRehash(NULL);
+		Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
 
-	virtual void OnRehash(User* user, const std::string &param)
+	void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 
 		sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
 
@@ -45,97 +45,65 @@ class ModuleWaitPong : public Module
 			killonbadreply = true;
 	}
 
-
-	char* RandString(unsigned int length)
+	std::string RandString()
 	{
-		unsigned char* out = new unsigned char[length+1];
-		for(unsigned int i = 0; i < length; i++)
+		char out[11];
+		for(unsigned int i = 0; i < 10; i++)
 			out[i] = ((rand() % 26) + 65);
-		out[length] = '\0';
+		out[10] = '\0';
 
-		return (char*)out;
+		return out;
 	}
 
-	virtual int OnUserRegister(User* user)
+	ModResult OnUserRegister(User* user)
 	{
-		char* pingrpl = RandString(10);
+		std::string pingrpl = RandString();
 
-		user->Write("PING :%s", pingrpl);
+		user->Write("PING :%s", pingrpl.c_str());
 
 		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.c_str(), 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.c_str(), pingrpl.c_str(), pingrpl.c_str());
 
-		user->Extend(extenstr, pingrpl);
-		return 0;
+		ext.set(user, pingrpl);
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User* user, bool validated, const std::string &original_line)
+	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User* user, bool validated, const std::string &original_line)
 	{
 		if (command == "PONG")
 		{
-			char* pingrpl;
-			user->GetExt(extenstr, pingrpl);
+			std::string* pingrpl = ext.get(user);
 
 			if (pingrpl)
 			{
-				if (strcmp(pingrpl, parameters[0].c_str()) == 0)
+				if (!parameters.empty() && *pingrpl == parameters[0])
 				{
-					delete[] pingrpl;
-					user->Shrink(extenstr);
-					return 1;
+					ext.unset(user);
+					return MOD_RES_DENY;
 				}
 				else
 				{
 					if(killonbadreply)
 						ServerInstance->Users->QuitUser(user, "Incorrect ping reply for registration");
-					return 1;
+					return MOD_RES_DENY;
 				}
 			}
 		}
-		return 0;
-	}
-
-	virtual bool OnCheckReady(User* user)
-	{
-		char* pingrpl;
-		return (!user->GetExt(extenstr, pingrpl));
-	}
-
-	virtual void OnUserDisconnect(User* user)
-	{
-		char* pingrpl;
-		user->GetExt(extenstr, pingrpl);
-
-		if (pingrpl)
-		{
-			delete[] pingrpl;
-			user->Shrink(extenstr);
-		}
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnCleanup(int target_type, void* item)
+	ModResult OnCheckReady(User* user)
 	{
-		if (target_type == TYPE_USER)
-		{
-			User* user = (User*)item;
-			char* pingrpl;
-			user->GetExt(extenstr, pingrpl);
-
-			if (pingrpl)
-			{
-				delete[] pingrpl;
-				user->Shrink(extenstr);
-			}
-		}
+		return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 	}
 
-	virtual ~ModuleWaitPong()
+	~ModuleWaitPong()
 	{
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR, API_VERSION);
+		return Version("Require pong prior to registration", VF_VENDOR);
 	}
 
 };