* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*/
class joinfloodsettings : public classbase
{
+ private:
+ InspIRCd* ServerInstance;
public:
-
int secs;
int joins;
time_t reset;
time_t unlocktime;
int counter;
bool locked;
- InspIRCd* ServerInstance;
-
- joinfloodsettings() : secs(0), joins(0) {};
- joinfloodsettings(int b, int c) : secs(b), joins(c)
+ joinfloodsettings(InspIRCd *Instance, int b, int c) : ServerInstance(Instance), secs(b), joins(c)
{
- reset = time(NULL) + secs;
+ reset = ServerInstance->Time() + secs;
counter = 0;
locked = false;
};
void addjoin()
{
counter++;
- if (time(NULL) > reset)
+ if (ServerInstance->Time() > reset)
{
counter = 0;
- reset = time(NULL) + secs;
+ reset = ServerInstance->Time() + secs;
}
}
{
if (locked)
{
- if (time(NULL) > unlocktime)
+ if (ServerInstance->Time() > unlocktime)
{
locked = false;
return false;
void lock()
{
locked = true;
- unlocktime = time(NULL) + 60;
+ unlocktime = ServerInstance->Time() + 60;
}
};
return std::make_pair(true, ConvToStr(x->joins)+":"+ConvToStr(x->secs));
else
return std::make_pair(false, parameter);
- }
+ }
bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
{
return (their_param < our_param);
}
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
{
joinfloodsettings* dummy;
int nsecs = atoi(secs);
if ((njoins<1) || (nsecs<1))
{
- source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
+ source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
parameter.clear();
return MODEACTION_DENY;
}
if (!channel->GetExt("joinflood", dummy))
{
parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
- joinfloodsettings *f = new joinfloodsettings(nsecs,njoins);
+ joinfloodsettings *f = new joinfloodsettings(ServerInstance, nsecs, njoins);
channel->Extend("joinflood", f);
- channel->SetMode('j', true);
- channel->SetModeParam('j', parameter.c_str(), true);
+ channel->SetModeParam('j', parameter);
return MODEACTION_ALLOW;
}
else
joinfloodsettings* f;
channel->GetExt("joinflood", f);
delete f;
- f = new joinfloodsettings(nsecs,njoins);
+ f = new joinfloodsettings(ServerInstance, nsecs, njoins);
channel->Shrink("joinflood");
channel->Extend("joinflood", f);
- channel->SetModeParam('j', cur_param.c_str(), false);
- channel->SetModeParam('j', parameter.c_str(), true);
+ channel->SetModeParam('j', parameter);
return MODEACTION_ALLOW;
}
else
}
else
{
- source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
+ source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
return MODEACTION_DENY;
}
}
channel->GetExt("joinflood", f);
delete f;
channel->Shrink("joinflood");
- channel->SetMode('j', false);
+ channel->SetModeParam('j', "");
return MODEACTION_ALLOW;
}
}
class ModuleJoinFlood : public Module
{
-
+
JoinFlood* jf;
-
+
public:
-
+
ModuleJoinFlood(InspIRCd* Me)
: Module(Me)
{
-
+
jf = new JoinFlood(ServerInstance);
- if (!ServerInstance->AddMode(jf))
+ if (!ServerInstance->Modes->AddMode(jf))
throw ModuleException("Could not add new modes!");
Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreJoin, I_OnUserJoin };
ServerInstance->Modules->Attach(eventlist, this, 3);
}
-
- virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs)
+
+ virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
{
if (chan)
{
{
if (f->islocked())
{
- user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
+ user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
return 1;
}
}
return 0;
}
- virtual void OnUserJoin(User* user, Channel* channel, bool &silent)
+ virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent)
{
joinfloodsettings *f;
+
+ /* We arent interested in JOIN events caused by a network burst */
+ if (sync)
+ return;
+
+ /* But all others are OK */
if (channel->GetExt("joinflood",f))
{
f->addjoin();
{
f->clear();
f->lock();
- channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name, f->joins, f->secs);
+ channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name.c_str(), f->joins, f->secs);
}
}
}
ServerInstance->Modes->DelMode(jf);
delete jf;
}
-
+
virtual Version GetVersion()
{
- return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
}
};
projects / user / henk / code / inspircd.git / blobdiff