Add Module::init() for correct exception handling during hook registration

[user/henk/code/inspircd.git] / src / userprocess.cpp

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index b150f2828ebb4951b809ee0189a84bb572831ba7..75cd8634a5935e9b4660f96cafba4cbe889ab1f0 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,17 +20,17 @@
 
 void FloodQuitUserHandler::Call(User* current)
 {
-       Server->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident.c_str(), current->host.c_str());
-       Server->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
+       ServerInstance->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident.c_str(), current->host.c_str());
+       ServerInstance->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
                        current->registered == REG_ALL ? current->nick.c_str() : "",
                        current->registered == REG_ALL ? "!" : "", current->ident.c_str(), current->host.c_str());
-       Server->Users->QuitUser(current, "Excess flood");
+       ServerInstance->Users->QuitUser(current, "Excess flood");
 
        if (current->registered != REG_ALL)
        {
-               ZLine* zl = new ZLine(Server, Server->Time(), 0, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
-               if (Server->XLines->AddLine(zl,NULL))
-                       Server->XLines->ApplyLines();
+               ZLine* zl = new ZLine(ServerInstance->Time(), 0, ServerInstance->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
+               if (ServerInstance->XLines->AddLine(zl,NULL))
+                       ServerInstance->XLines->ApplyLines();
                else
                        delete zl;
        }
@@ -46,24 +46,23 @@ void InspIRCd::DoBackgroundUserStuff()
        /*
         * loop over all local users..
         */
-       std::vector<User*>::reverse_iterator count2 = this->Users->local_users.rbegin();
+       std::vector<LocalUser*>::reverse_iterator count2 = this->Users->local_users.rbegin();
        while (count2 != this->Users->local_users.rend())
        {
-               User *curr = *count2;
+               LocalUser *curr = *count2;
                count2++;
 
                if (curr->quitting)
                        continue;
 
-               if (curr->Penalty)
+               if (curr->CommandFloodPenalty)
                {
-                       curr->Penalty--;
-                       curr->OnDataReady();
-               }
-
-               if (curr->getSendQSize() == 0)
-               {
-                       FOREACH_MOD(I_OnBufferFlushed,OnBufferFlushed(curr));
+                       unsigned int rate = curr->MyClass->GetCommandRate();
+                       if (curr->CommandFloodPenalty > rate)
+                               curr->CommandFloodPenalty -= rate;
+                       else
+                               curr->CommandFloodPenalty = 0;
+                       curr->eh.OnDataReady();
                }
 
                switch (curr->registered)
@@ -83,7 +82,7 @@ void InspIRCd::DoBackgroundUserStuff()
                                                continue;
                                        }
 
-                                       curr->Write("PING :%s",this->Config->ServerName);
+                                       curr->Write("PING :%s",this->Config->ServerName.c_str());
                                        curr->lastping = 0;
                                        curr->nping = TIME  +curr->MyClass->GetPingTime();
                                }