#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)
+
+
+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];
+ unsigned char* out = new unsigned char[length+1];
to64frombits(out, tmp, (length/4)*3);
- std::string ret((char*)out);
-
- delete out;
- delete tmp;
+ out[length] = '\0';
- return ret;
+ DELETE(tmp);
+
+ return (char*)out;
}
class ModuleWaitPong : public Module
{
- Server* Srv;
+
ConfigReader* Conf;
bool sendsnotice;
bool killonbadreply;
public:
- ModuleWaitPong(Server* Me)
+ ModuleWaitPong(InspIRCd* Me)
: Module::Module(Me)
{
- Srv = Me;
+
OnRehash("");
}
- virtual void OnRehash(std::string param)
+ virtual void OnRehash(const std::string ¶m)
{
- Conf = new ConfigReader;
+ Conf = new ConfigReader(ServerInstance);
sendsnotice = Conf->ReadFlag("waitpong", "sendsnotice", 0);
if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
killonbadreply = true;
- delete Conf;
+ DELETE(Conf);
}
void Implements(char* List)
{
- List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = List[I_OnPreCommand] = List[I_OnRehash] = 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)
{
- 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("waitpong_pingstr", pingrpl);
}
- 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("waitpong_pingstr", 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");
+ if(strcmp(pingrpl, parameters[0]) == 0)
+ {
+ DELETE(pingrpl);
+ user->Shrink("waitpong_pingstr");
+ return 1;
+ }
+ else
+ {
+ if(killonbadreply)
+ userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
+ return 1;
+ }
}
}
virtual bool OnCheckReady(userrec* user)
{
- return (!user->GetExt("waitpong_pingstr"));
+ char* pingrpl;
+ return (!user->GetExt("waitpong_pingstr", pingrpl));
}
-
+
+ virtual void OnUserDisconnect(userrec* user)
+ {
+ char* pingrpl;
+ user->GetExt("waitpong_pingstr", pingrpl);
+
+ 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", pingrpl);
+
+ if(pingrpl)
+ {
+ DELETE(pingrpl);
+ user->Shrink("waitpong_pingstr");
+ }
+ }
+ }
+
virtual ~ModuleWaitPong()
{
}
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);
}