X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=71927a7f10ac034bb66cfb974be98b6a4d3e6185;hb=eacd707421be4f2612df9bde4517649061bb062e;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..71927a7f1 100644 --- a/src/modules/m_conn_waitpong.cpp +++ b/src/modules/m_conn_waitpong.cpp @@ -1,164 +1,143 @@ -#include -#include -#include "aes.h" -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ -/* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */ +#include "inspircd.h" -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; -} +/* $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; + const char* extenstr; public: - ModuleWaitPong(Server* Me) - : Module::Module(Me) + ModuleWaitPong(InspIRCd* Me) + : Module(Me), extenstr("waitpong_pingstr") { - Srv = Me; - OnRehash(""); + OnRehash(NULL,""); + Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash, I_OnUserDisconnect, I_OnCleanup }; + ServerInstance->Modules->Attach(eventlist, this, 6); } - - virtual void OnRehash(std::string param) + + virtual void OnRehash(User* user, const std::string ¶m) { - Conf = new ConfigReader; - - sendsnotice = Conf->ReadFlag("waitpong", "sendsnotice", 0); - - if(Conf->GetError() == CONF_VALUE_NOT_FOUND) + ConfigReader Conf(ServerInstance); + + 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 = Conf.ReadFlag("waitpong", "killonbadreply", 0); + + if(Conf.GetError() == CONF_VALUE_NOT_FOUND) killonbadreply = true; - - delete Conf; } - void Implements(char* List) + + char* RandString(unsigned int length) { - List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 1; + unsigned char* out = new unsigned char[length+1]; + for(unsigned int i = 0; i < length; i++) + out[i] = ((rand() % 26) + 65); + out[length] = '\0'; + + return (char*)out; } - virtual void OnUserRegister(userrec* user) + virtual int OnUserRegister(User* user) { char* pingrpl = RandString(10); - - Write(user->fd, "PING :%s", pingrpl); - + + user->Write("PING :%s", pingrpl); + 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, pingrpl); + + user->Extend(extenstr, pingrpl); + return 0; } - - virtual int OnPreCommand(std::string command, char** parameters, int pcnt, userrec* user, bool validated) + + virtual int OnPreCommand(std::string &command, std::vector ¶meters, User* 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) + char* pingrpl; + user->GetExt(extenstr, pingrpl); + + if (pingrpl) { - Srv->QuitUser(user, "Incorrect ping reply for registration"); - return 1; + if (!parameters.empty() && (strcmp(pingrpl, parameters[0].c_str()) == 0)) + { + delete[] pingrpl; + user->Shrink(extenstr); + return 1; + } + else + { + if(killonbadreply) + ServerInstance->Users->QuitUser(user, "Incorrect ping reply for registration"); + return 1; + } } } - return 0; } - virtual bool OnCheckReady(userrec* user) + virtual bool OnCheckReady(User* user) { - return (!user->GetExt("waitpong_pingstr")); + char* pingrpl; + return (!user->GetExt(extenstr, pingrpl)); } - - virtual void OnUserDisconnect(userrec* user) + + virtual void OnUserDisconnect(User* user) { - char* pingrpl = user->GetExt("waitpong_pingstr"); + char* pingrpl; + user->GetExt(extenstr, pingrpl); - if(pingrpl) + if (pingrpl) { - delete pingrpl; - user->Shrink("waitpong_pingstr"); + delete[] pingrpl; + user->Shrink(extenstr); } } - + virtual void OnCleanup(int target_type, void* item) { - if(target_type == TYPE_USER) + if (target_type == TYPE_USER) { - userrec* user = (userrec*)item; - char* pingrpl = user->GetExt("waitpong_pingstr"); - - if(pingrpl) + User* user = (User*)item; + char* pingrpl; + user->GetExt(extenstr, pingrpl); + + if (pingrpl) { - delete pingrpl; - user->Shrink("waitpong_pingstr"); - } + delete[] pingrpl; + user->Shrink(extenstr); + } } } - + virtual ~ModuleWaitPong() { } - + virtual Version GetVersion() { - return Version(1, 0, 0, 1, VF_VENDOR); + return Version("$Id$", VF_VENDOR, API_VERSION); } - -}; -class ModuleWaitPongFactory : public ModuleFactory -{ - public: - ModuleWaitPongFactory() - { - } - - ~ModuleWaitPongFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleWaitPong(Me); - } }; - -extern "C" void * init_module( void ) -{ - return new ModuleWaitPongFactory; -} +MODULE_INIT(ModuleWaitPong)