Remove m_sqlv2.h from these modules, they both use v3 now.

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index b150f2828ebb4951b809ee0189a84bb572831ba7..2792a28dc0d1f76a72ecfa03635a96e703218be7 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,30 +46,29 @@ 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->eh.getSendQSize())
                {
-                       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)
                {
                        case REG_ALL:
-                               if (TIME > curr->nping)
+                               if (Time() > curr->nping)
                                {
                                        // This user didn't answer the last ping, remove them
                                        if (!curr->lastping)
@@ -78,14 +77,14 @@ void InspIRCd::DoBackgroundUserStuff()
                                                char message[MAXBUF];
                                                snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : "");
                                                curr->lastping = 1;
-                                               curr->nping = TIME + curr->MyClass->GetPingTime();
+                                               curr->nping = Time() + curr->MyClass->GetPingTime();
                                                this->Users->QuitUser(curr, message);
                                                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();
+                                       curr->nping = Time()  +curr->MyClass->GetPingTime();
                                }
                                break;
                        case REG_NICKUSER:
@@ -98,7 +97,7 @@ void InspIRCd::DoBackgroundUserStuff()
                                break;
                }
 
-               if (curr->registered != REG_ALL && (TIME > (curr->age + curr->MyClass->GetRegTimeout())))
+               if (curr->registered != REG_ALL && (Time() > (curr->age + curr->MyClass->GetRegTimeout())))
                {
                        /*
                         * registration timeout -- didnt send USER/NICK/HOST