Include explicit routing information in Command, will replace CMD_LOCALONLY return...

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

diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index 10ae40cb752c69859246f3e5d5aa6a69d939733a..edb5aff3ecfc1191944324811f1fece72234b53b 100644 (file)
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -48,7 +48,11 @@ class nickfloodsettings : public classbase
 
        bool shouldlock()
        {
-               return (counter >= this->nicks);
+               /* XXX HACK: using counter + 1 here now to allow the counter to only be incremented
+                * on successful nick changes; this will be checked before the counter is
+                * incremented.
+                */
+               return (counter + 1 >= this->nicks);
        }
 
        void clear()
@@ -97,12 +101,6 @@ class NickFlood : 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, Channel* channel)
-       {
-               /* When TS is equal, the alphabetically later one wins */
-               return (their_param < our_param);
-       }
-
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                nickfloodsettings* dummy;
@@ -144,8 +142,7 @@ class NickFlood : public ModeHandler
                                                parameter = ConvToStr(nnicks) + ":" +ConvToStr(nsecs);
                                                nickfloodsettings *f = new nickfloodsettings(ServerInstance, nsecs, nnicks);
                                                channel->Extend("nickflood", f);
-                                               channel->SetMode('F', true);
-                                               channel->SetModeParam('F', parameter.c_str(), true);
+                                               channel->SetModeParam('F', parameter);
                                                return MODEACTION_ALLOW;
                                        }
                                        else
@@ -168,8 +165,7 @@ class NickFlood : public ModeHandler
                                                                f = new nickfloodsettings(ServerInstance, nsecs, nnicks);
                                                                channel->Shrink("nickflood");
                                                                channel->Extend("nickflood", f);
-                                                               channel->SetModeParam('F', cur_param.c_str(), false);
-                                                               channel->SetModeParam('F', parameter.c_str(), true);
+                                                               channel->SetModeParam('F', parameter);
                                                                return MODEACTION_ALLOW;
                                                        }
                                                        else
@@ -194,7 +190,7 @@ class NickFlood : public ModeHandler
                                channel->GetExt("nickflood", f);
                                delete f;
                                channel->Shrink("nickflood");
-                               channel->SetMode('F', false);
+                               channel->SetModeParam('F', "");
                                return MODEACTION_ALLOW;
                        }
                }
@@ -204,19 +200,17 @@ class NickFlood : public ModeHandler
 
 class ModuleNickFlood : public Module
 {
-       NickFlood* jf;
+       NickFlood jf;
 
  public:
 
        ModuleNickFlood(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), jf(Me)
        {
-
-               jf = new NickFlood(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(jf))
+               if (!ServerInstance->Modes->AddMode(&jf))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNick };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnChannelDelete, I_OnUserPreNick, I_OnUserPostNick };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
        virtual int OnUserPreNick(User* user, const std::string &newnick)
@@ -240,7 +234,6 @@ class ModuleNickFlood : public Module
                                        return 1;
                                }
 
-                               f->addnick();
                                if (f->shouldlock())
                                {
                                        f->clear();
@@ -254,6 +247,34 @@ class ModuleNickFlood : public Module
                return 0;
        }
 
+       /*
+        * XXX: HACK: We do the increment on the *POST* event here (instead of all together) because we have no way of knowing whether other modules would block a nickchange.
+        */
+       virtual void OnUserPostNick(User* user, const std::string &oldnick)
+       {
+               if (isdigit(user->nick[0])) /* allow switches to UID */
+                       return;
+
+               for (UCListIter i = user->chans.begin(); i != user->chans.end(); ++i)
+               {
+                       Channel *channel = i->first;
+
+                       nickfloodsettings *f;
+                       if (channel->GetExt("nickflood", f))
+                       {
+                               if (CHANOPS_EXEMPT(ServerInstance, 'F') && channel->GetStatus(user) == STATUS_OP)
+                                       return;
+                               
+                               /* moved this here to avoid incrementing the counter for nick
+                                * changes that are denied for some other reason (bans, +N, etc.)
+                                * per bug #874.
+                                */
+                               f->addnick();
+                       }
+               }
+               return;
+       }
+
        void OnChannelDelete(Channel* chan)
        {
                nickfloodsettings *f;
@@ -267,8 +288,7 @@ class ModuleNickFlood : public Module
 
        virtual ~ModuleNickFlood()
        {
-               ServerInstance->Modes->DelMode(jf);
-               delete jf;
+               ServerInstance->Modes->DelMode(&jf);
        }
 
        virtual Version GetVersion()