X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=d9341c79f5feb67884161b8a312ad1ccfb2b25d3;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=1b9301de5114c48b990bd7160c26bdc52c480fc0;hpb=9ee588b23fd915255d2cea0c537e6938297dbe5b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp
index 1b9301de5..d9341c79f 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-2010 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 */
@@ -25,39 +36,26 @@ class ModuleWaitPong : public Module
 	ModuleWaitPong()
 	 : ext("waitpong_pingstr", this)
 	{
-		OnRehash(NULL);
-		Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
 	}
 
-	void OnRehash(User* user)
+	void init()
 	{
-		ConfigReader Conf;
-
-		sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
-
-		if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
-			sendsnotice = true;
-
-		killonbadreply = Conf.ReadFlag("waitpong", "killonbadreply", 0);
-
-		if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
-			killonbadreply = true;
+		ServerInstance->Modules->AddService(ext);
+		OnRehash(NULL);
+		Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	std::string RandString()
+	void OnRehash(User* user)
 	{
-		char out[11];
-		for(unsigned int i = 0; i < 10; i++)
-			out[i] = ((rand() % 26) + 65);
-		out[10] = '\0';
-
-		return out;
+		ConfigTag* tag = ServerInstance->Config->ConfValue("waitpong");
+		sendsnotice = tag->getBool("sendsnotice", true);
+		killonbadreply = tag->getBool("killonbadreply", true);
 	}
 
 	ModResult OnUserRegister(LocalUser* user)
 	{
-		std::string pingrpl = RandString();
+		std::string pingrpl = ServerInstance->GenRandomStr(10);
 
 		user->Write("PING :%s", pingrpl.c_str());
 
@@ -97,15 +95,10 @@ class ModuleWaitPong : public Module
 		return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 	}
 
-	~ModuleWaitPong()
-	{
-	}
-
 	Version GetVersion()
 	{
 		return Version("Require pong prior to registration", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleWaitPong)