X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=764246e8476658b3d3228505b244da1d7539820e;hb=6b929c6dbb3d36c3873ab9911ad4d8a46ddbdc99;hp=b77116410ffcd8bc6198a8d302532ff67c586ddb;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index b77116410..764246e84 100644
--- a/src/modules/m_conn_waitpong.cpp
+++ b/src/modules/m_conn_waitpong.cpp
@@ -1,16 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */
@@ -22,9 +33,10 @@ class ModuleWaitPong : public Module
 	LocalStringExt ext;
 
  public:
-	ModuleWaitPong(InspIRCd* Me)
-	 : Module(Me), ext("waitpong_pingstr", this)
+	ModuleWaitPong()
+	 : ext("waitpong_pingstr", this)
 	{
+		ServerInstance->Modules->AddService(ext);
 		OnRehash(NULL);
 		Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, 4);
@@ -32,7 +44,7 @@ class ModuleWaitPong : public Module
 
 	void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 
 		sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
 
@@ -45,19 +57,9 @@ class ModuleWaitPong : public Module
 			killonbadreply = true;
 	}
 
-	std::string RandString()
-	{
-		char out[11];
-		for(unsigned int i = 0; i < 10; i++)
-			out[i] = ((rand() % 26) + 65);
-		out[10] = '\0';
-
-		return out;
-	}
-
-	ModResult OnUserRegister(User* user)
+	ModResult OnUserRegister(LocalUser* user)
 	{
-		std::string pingrpl = RandString();
+		std::string pingrpl = ServerInstance->GenRandomStr(10);
 
 		user->Write("PING :%s", pingrpl.c_str());
 
@@ -68,7 +70,7 @@ class ModuleWaitPong : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult 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, LocalUser* user, bool validated, const std::string &original_line)
 	{
 		if (command == "PONG")
 		{
@@ -92,7 +94,7 @@ class ModuleWaitPong : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnCheckReady(User* user)
+	ModResult OnCheckReady(LocalUser* user)
 	{
 		return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 	}