+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd: (C) 2002-2007 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.
+ *
+ * ---------------------------------------------------
+ */
+
#include <stdlib.h>
#include <string>
-#include "aes.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
/* $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;
-}
-
class ModuleWaitPong : public Module
{
- Server* Srv;
- ConfigReader* Conf;
-
+ InspIRCd* Instance;
bool sendsnotice;
bool killonbadreply;
+ const char* extenstr;
public:
- ModuleWaitPong(Server* Me)
- : Module::Module(Me)
+ ModuleWaitPong(InspIRCd* Me)
+ : Module::Module(Me), Instance(Me), extenstr("waitpong_pingstr")
{
- Srv = Me;
- OnRehash("");
+ OnRehash(NULL,"");
}
- virtual void OnRehash(std::string param)
+ virtual void OnRehash(userrec* user, const std::string ¶m)
{
- Conf = new ConfigReader;
+ ConfigReader Conf(Instance);
- sendsnotice = Conf->ReadFlag("waitpong", "sendsnotice", 0);
+ sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
- if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
+ if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
sendsnotice = true;
- killonbadreply = Conf->ReadFlag("waitpong", "killonbadreply", 0);
+ killonbadreply = Conf.ReadFlag("waitpong", "killonbadreply", 0);
- if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
+ if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
killonbadreply = true;
-
- delete Conf;
}
void Implements(char* List)
{
- List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = 1;
+ List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 1;
}
- virtual void OnUserRegister(userrec* user)
+ char* RandString(unsigned int length)
+ {
+ 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 int OnUserRegister(userrec* user)
{
- std::string* pingrpl = new std::string;
- *pingrpl = RandString(10);
+ char* pingrpl = RandString(10);
- Srv->Send(user->fd, "PING :" + *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->c_str(), pingrpl->c_str());
+ 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, pingrpl, pingrpl);
- user->Extend("waitpong_pingstr", (char*)pingrpl);
+ user->Extend(extenstr, pingrpl);
+ return 0;
}
- virtual int OnPreCommand(std::string command, char** parameters, int pcnt, userrec* user, bool validated)
+ virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line)
{
if(command == "PONG")
{
- std::string* pingrpl = (std::string*)user->GetExt("waitpong_pingstr");
+ char* pingrpl;
+ user->GetExt(extenstr, pingrpl);
- if(pingrpl && (*pingrpl == parameters[0]))
+ if(pingrpl)
{
- delete pingrpl;
- user->Shrink("waitpong_pingstr");
- return 1;
- }
- else if(killonbadreply)
- {
- Srv->QuitUser(user, "Incorrect ping reply for registration");
- return 1;
+ if(strcmp(pingrpl, parameters[0]) == 0)
+ {
+ DELETE(pingrpl);
+ user->Shrink(extenstr);
+ return 1;
+ }
+ else
+ {
+ if(killonbadreply)
+ userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
+ return 1;
+ }
}
}
-
return 0;
}
virtual bool OnCheckReady(userrec* user)
{
- return (!user->GetExt("waitpong_pingstr"));
+ char* pingrpl;
+ return (!user->GetExt(extenstr, pingrpl));
}
virtual void OnUserDisconnect(userrec* user)
{
- std::string* pingrpl = (std::string*)user->GetExt("waitpong_pingstr");
+ char* pingrpl;
+ user->GetExt(extenstr, 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)
+ {
+ userrec* user = (userrec*)item;
+ char* pingrpl;
+ user->GetExt(extenstr, pingrpl);
+
+ if(pingrpl)
+ {
+ DELETE(pingrpl);
+ user->Shrink(extenstr);
+ }
}
}
virtual Version GetVersion()
{
- return Version(1, 0, 0, 0, VF_VENDOR);
+ return Version(1, 1, 0, 1, VF_VENDOR, API_VERSION);
}
};
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleWaitPong(Me);
}
projects / user / henk / code / inspircd.git / blobdiff