X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=1d48220a6b096330cbafecd9e077216149042f35;hb=6a1892b1c1bdd8e8ecb519933ee9887adb5b8585;hp=a97e7f72c53c05247327c63cc39f873c8511ea67;hpb=a3f476f7945fa2ea9c39e0429a5456366a6f8152;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp index a97e7f72c..1d48220a6 100644 --- a/src/modules/m_conn_waitpong.cpp +++ b/src/modules/m_conn_waitpong.cpp @@ -1,164 +1,109 @@ -#include -#include -#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 + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2006-2007 Oliver Lupton + * Copyright (C) 2006 Craig Edwards + * + * 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 . + */ -/* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */ -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+1]; - - to64frombits(out, tmp, (length/4)*3); - - out[length] = '\0'; - - delete tmp; - - return (char*)out; -} +#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() { - 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) { - List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 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) { - char* pingrpl = RandString(10); - - Write(user->fd, "PING :%s", 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, pingrpl); - - user->Extend("waitpong_pingstr", 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()); + + 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 ¶meters, LocalUser* user, bool validated, const std::string &original_line) { - if(command == "PONG") + if (command == "PONG") { - char* pingrpl = user->GetExt("waitpong_pingstr"); - - if(pingrpl && (strcmp(pingrpl, parameters[0]) == 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; + return MOD_RES_PASSTHRU; } - virtual bool OnCheckReady(userrec* user) + ModResult OnCheckReady(LocalUser* user) { - return (!user->GetExt("waitpong_pingstr")); + return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU; } - - virtual void OnUserDisconnect(userrec* user) - { - char* pingrpl = user->GetExt("waitpong_pingstr"); - 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"); - - if(pingrpl) - { - delete pingrpl; - user->Shrink("waitpong_pingstr"); - } - } - } - - virtual ~ModuleWaitPong() + ~ModuleWaitPong() { } - - virtual Version GetVersion() - { - return Version(1, 0, 0, 1, VF_VENDOR); - } - -}; -class ModuleWaitPongFactory : public ModuleFactory -{ - public: - ModuleWaitPongFactory() - { - } - - ~ModuleWaitPongFactory() - { - } - - virtual Module * CreateModule(Server* Me) + Version GetVersion() { - 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)