-#include <stdlib.h>
-#include <string>
-#include "aes.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ * 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 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/>.
+ */
-/* $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)
-{
- 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];
-
- to64frombits(out, tmp, (length/4)*3);
-
- std::string ret((char*)out);
-
- delete out;
- delete tmp;
-
- return ret;
-}
+#include "inspircd.h"
+
+/* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */
class ModuleWaitPong : public Module
{
- Server* Srv;
- ConfigReader* Conf;
-
bool sendsnotice;
bool killonbadreply;
+ LocalStringExt ext;
public:
- ModuleWaitPong(Server* Me)
- : Module::Module(Me)
+ ModuleWaitPong()
+ : ext("waitpong_pingstr", this)
{
- Srv = Me;
- OnRehash("");
}
-
- virtual void OnRehash(std::string param)
+
+ void init() CXX11_OVERRIDE
{
- Conf = new ConfigReader;
-
- 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;
-
- delete Conf;
+ 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));
}
- void Implements(char* List)
+ void OnRehash(User* user) CXX11_OVERRIDE
{
- List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = 1;
+ ConfigTag* tag = ServerInstance->Config->ConfValue("waitpong");
+ sendsnotice = tag->getBool("sendsnotice", true);
+ killonbadreply = tag->getBool("killonbadreply", true);
}
- virtual void OnUserRegister(userrec* user)
+ ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
{
- std::string* pingrpl = new std::string;
- *pingrpl = RandString(10);
-
- Srv->Send(user->fd, "PING :" + *pingrpl);
-
+ std::string pingrpl = ServerInstance->GenRandomStr(10);
+
+ user->Write("PING :%s", pingrpl.c_str());
+
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());
-
- user->Extend("waitpong_pingstr", (char*)pingrpl);
+ user->WriteNotice("*** If you are having problems connecting due to ping timeouts, please type /quote PONG " + pingrpl + " or /raw PONG " + pingrpl + " now.");
+
+ ext.set(user, pingrpl);
+ return MOD_RES_PASSTHRU;
}
-
- virtual int OnPreCommand(std::string command, char** parameters, int pcnt, userrec* user, bool validated)
+
+ ModResult OnPreCommand(std::string &command, std::vector<std::string> ¶meters, LocalUser* user, bool validated, const std::string &original_line) CXX11_OVERRIDE
{
- if(command == "PONG")
+ if (command == "PONG")
{
- std::string* pingrpl = (std::string*)user->GetExt("waitpong_pingstr");
-
- if(pingrpl && (*pingrpl == parameters[0]))
- {
- delete pingrpl;
- user->Shrink("waitpong_pingstr");
- return 1;
- }
- else if(killonbadreply)
+ std::string* pingrpl = ext.get(user);
+
+ if (pingrpl)
{
- Srv->QuitUser(user, "Incorrect ping reply for registration");
- return 1;
+ if (!parameters.empty() && *pingrpl == parameters[0])
+ {
+ ext.unset(user);
+ return MOD_RES_DENY;
+ }
+ else
+ {
+ if(killonbadreply)
+ ServerInstance->Users->QuitUser(user, "Incorrect ping reply for registration");
+ return MOD_RES_DENY;
+ }
}
}
-
- return 0;
- }
-
- virtual bool OnCheckReady(userrec* user)
- {
- return (!user->GetExt("waitpong_pingstr"));
+ return MOD_RES_PASSTHRU;
}
-
- virtual void OnUserDisconnect(userrec* user)
- {
- std::string* pingrpl = (std::string*)user->GetExt("waitpong_pingstr");
- if(pingrpl)
- {
- delete pingrpl;
- user->Shrink("waitpong_pingstr");
- }
- }
-
- virtual ~ModuleWaitPong()
+ ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
{
+ return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
}
-
- virtual Version GetVersion()
- {
- return Version(1, 0, 0, 0, VF_VENDOR);
- }
-
-};
-class ModuleWaitPongFactory : public ModuleFactory
-{
- public:
- ModuleWaitPongFactory()
- {
- }
-
- ~ModuleWaitPongFactory()
+ Version GetVersion() CXX11_OVERRIDE
{
- }
-
- virtual Module * CreateModule(Server* Me)
- {
- return new ModuleWaitPong(Me);
+ return Version("Require pong prior to registration", VF_VENDOR);
}
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleWaitPongFactory;
-}
+MODULE_INIT(ModuleWaitPong)