Move some stuff around so the last penalty line doesnt get held erroneously until...

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index cf062e397634cd8cb401c00fe751177a550ac95a..d0b5bbbe0d1b5fb245be820ac2f5c4a92cba1a44 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -82,7 +82,7 @@ void InspIRCd::Cleanup()
        }
 
        /* Close all client sockets, or the new process inherits them */
-       for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+       for (std::vector<User*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
        {
                (*i)->SetWriteError("Server shutdown");
                (*i)->CloseSocket();
@@ -338,7 +338,6 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->SNO = new SnomaskManager(this);
        this->TIME = this->OLDTIME = this->startup_time = time(NULL);
        this->time_delta = 0;
-       this->next_call = this->TIME + 3;
        srand(this->TIME);
 
        *this->LogFileName = 0;
@@ -463,7 +462,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->InitialiseUID();
 
        /* set up fake client */
-       this->FakeClient = new userrec(this);
+       this->FakeClient = new User(this);
        this->FakeClient->SetFd(FD_MAGIC_NUMBER);
 
        if (!do_root)
@@ -615,14 +614,18 @@ int InspIRCd::Run()
                if (TIME != OLDTIME)
                {
                        if (TIME < OLDTIME)
+                       {
                                WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
+                       }
+
                        if ((TIME % 3600) == 0)
                        {
                                this->RehashUsersAndChans();
                                FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
                        }
+
                        Timers->TickTimers(TIME);
-                       this->DoBackgroundUserStuff(TIME);
+                       this->DoBackgroundUserStuff();
 
                        if ((TIME % 5) == 0)
                        {
@@ -664,7 +667,7 @@ int InspIRCd::Run()
                this->GlobalCulls.Apply();
 
                /* If any inspsockets closed, remove them */
-               this->InspSocketCull();
+               this->BufferedSocketCull();
 
                if (this->s_signal)
                {
@@ -676,9 +679,9 @@ int InspIRCd::Run()
        return 0;
 }
 
-void InspIRCd::InspSocketCull()
+void InspIRCd::BufferedSocketCull()
 {
-       for (std::map<InspSocket*,InspSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
+       for (std::map<BufferedSocket*,BufferedSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
        {
                SE->DelFd(x->second);
                x->second->Close();
@@ -721,7 +724,7 @@ int main(int argc, char** argv)
  * (until this returns true, a user will block in the waiting state, waiting to connect up to the
  * registration timeout maximum seconds)
  */
-bool InspIRCd::AllModulesReportReady(userrec* user)
+bool InspIRCd::AllModulesReportReady(User* user)
 {
        if (!Config->global_implementation[I_OnCheckReady])
                return true;
@@ -753,7 +756,7 @@ int InspIRCd::SetTimeDelta(int delta)
        return old;
 }
 
-void InspIRCd::AddLocalClone(userrec* user)
+void InspIRCd::AddLocalClone(User* user)
 {
        clonemap::iterator x = local_clones.find(user->GetIPString());
        if (x != local_clones.end())
@@ -762,7 +765,7 @@ void InspIRCd::AddLocalClone(userrec* user)
                local_clones[user->GetIPString()] = 1;
 }
 
-void InspIRCd::AddGlobalClone(userrec* user)
+void InspIRCd::AddGlobalClone(User* user)
 {
        clonemap::iterator y = global_clones.find(user->GetIPString());
        if (y != global_clones.end())