Socket engine tweaks to fix a glitch, and improvements to new m_ident

[user/henk/code/inspircd.git] / src / modules / m_messageflood.cpp

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 1f6f0cea721233221ee9990beac400ea87720921..e7dd6e272eace3cbc85e184f95b5d44bc42561fa 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides channel mode +f (message flood protection) */
 
@@ -27,7 +24,7 @@ class floodsettings : public classbase
        int secs;
        int lines;
        time_t reset;
-       std::map<userrec*,int> counters;
+       std::map<User*,int> counters;
 
        floodsettings() : ban(0), secs(0), lines(0) {};
        floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
@@ -35,9 +32,9 @@ class floodsettings : public classbase
                reset = time(NULL) + secs;
        };
 
-       void addmessage(userrec* who)
+       void addmessage(User* who)
        {
-               std::map<userrec*,int>::iterator iter = counters.find(who);
+               std::map<User*,int>::iterator iter = counters.find(who);
                if (iter != counters.end())
                {
                        iter->second++;
@@ -53,9 +50,9 @@ class floodsettings : public classbase
                }
        }
 
-       bool shouldkick(userrec* who)
+       bool shouldkick(User* who)
        {
-               std::map<userrec*,int>::iterator iter = counters.find(who);
+               std::map<User*,int>::iterator iter = counters.find(who);
                if (iter != counters.end())
                {
                        return (iter->second >= this->lines);
@@ -63,9 +60,9 @@ class floodsettings : public classbase
                else return false;
        }
 
-       void clear(userrec* who)
+       void clear(User* who)
        {
-               std::map<userrec*,int>::iterator iter = counters.find(who);
+               std::map<User*,int>::iterator iter = counters.find(who);
                if (iter != counters.end())
                {
                        counters.erase(iter);
@@ -80,7 +77,7 @@ class MsgFlood : public ModeHandler
  public:
        MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
        {
                floodsettings* x;
                if (channel->GetExt("flood",x))
@@ -89,13 +86,13 @@ class MsgFlood : public ModeHandler
                        return std::make_pair(false, parameter);
        }
 
-       bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+       bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
        {
                /* When TS is equal, the alphabetically later one wins */
                return (their_param < our_param);
        }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                floodsettings *f;
 
@@ -151,15 +148,29 @@ class MsgFlood : public ModeHandler
                                        }
                                        else
                                        {
-                                               if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
+                                               std::string cur_param = channel->GetModeParameter('f');
+                                               parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+                                               if (cur_param == parameter)
+                                               {
+                                                       // mode params match
+                                                       return MODEACTION_DENY;
+                                               }
+                                               else
                                                {
-                                                       delete f;
-                                                       floodsettings *f = new floodsettings(ban,nsecs,nlines);
-                                                       parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
-                                                       channel->Shrink("flood");
-                                                       channel->Extend("flood",f);
-                                                       channel->SetModeParam('f', parameter.c_str(), true);
-                                                       return MODEACTION_ALLOW;
+                                                       if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
+                                                       {
+                                                               delete f;
+                                                               floodsettings *f = new floodsettings(ban,nsecs,nlines);
+                                                               channel->Shrink("flood");
+                                                               channel->Extend("flood",f);
+                                                               channel->SetModeParam('f', cur_param.c_str(), false);
+                                                               channel->SetModeParam('f', parameter.c_str(), true);
+                                                               return MODEACTION_ALLOW;
+                                                       }
+                                                       else
+                                                       {
+                                                               return MODEACTION_DENY;
+                                                       }
                                                }
                                        }
                                }
@@ -202,11 +213,11 @@ class ModuleMsgFlood : public Module
                        throw ModuleException("Could not add new modes!");
        }
        
-       void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
+       int ProcessMessages(User* user,Channel* dest, const std::string &text)
        {
                if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)
                {
-                       return;
+                       return 0;
                }
 
                floodsettings *f;
@@ -239,28 +250,34 @@ class ModuleMsgFlood : public Module
                                }
                                char kickmessage[MAXBUF];
                                snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
-                               dest->ServerKickUser(user, kickmessage, true);
+                               if (!dest->ServerKickUser(user, kickmessage, true))
+                               {
+                                       delete dest;
+                                       return 1;
+                               }
                        }
                }
+               
+               return 0;
        }
 
-       virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+       virtual int OnUserPreMessage(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
-               {
-                       ProcessMessages(user,(chanrec*)dest,text);
-               }
+                       return ProcessMessages(user,(Channel*)dest,text);
+               
+               return 0;
        }
 
-       virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
+       virtual int OnUserPreNotice(User *user, void *dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
-               {
-                       ProcessMessages(user,(chanrec*)dest,text);
-               }
+                       return ProcessMessages(user,(Channel*)dest,text);
+                       
+               return 0;
        }
 
-       void OnChannelDelete(chanrec* chan)
+       void OnChannelDelete(Channel* chan)
        {
                floodsettings* f;
                if (chan->GetExt("flood", f))
@@ -272,7 +289,7 @@ class ModuleMsgFlood : public Module
 
        void Implements(char* List)
        {
-               List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
+               List[I_OnChannelDelete] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1;
        }
 
        virtual ~ModuleMsgFlood()
@@ -287,4 +304,4 @@ class ModuleMsgFlood : public Module
        }
 };
 
-MODULE_INIT(ModuleMsgFlood);
+MODULE_INIT(ModuleMsgFlood)