diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-11-09 21:51:48 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-11-09 21:51:48 +0000 |
| commit | b94c45340e153254f9dd06ecc3445222f31d0220 (patch) | |
| tree | 3f0dda82973d84bbbcf08c0e8e1115f89afc3be6 /src/modules/m_joinflood.cpp | |
| parent | c708d7a3c0defba07171a70c68636d0b14abf590 (diff) | |
Roadmap item "Fix jointhrottle to not try 'throttle' clients during a netmerge (requires changing join event to be aware of netmerge?)" -- 1.2 only
requires an extra parameter to OnUserJoin, bool sync. usually false, but FJOIN code during burst sets it to true.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8552 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/modules/m_joinflood.cpp')
| -rw-r--r-- | src/modules/m_joinflood.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp index a1f1f7a51..effe67dab 100644 --- a/src/modules/m_joinflood.cpp +++ b/src/modules/m_joinflood.cpp @@ -239,9 +239,15 @@ class ModuleJoinFlood : public Module 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(); |