Move _ext to replace the original, SVSSILENCE comes next

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index dd1ca179981c2a3e59cc97dbece77220667ff940..c2de4dc2b1d895cab85720d657945f9d50aa7223 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -21,7 +21,7 @@
 
 void FloodQuitUserHandler::Call(User* current)
 {
-       Server->Log(DEFAULT,"Excess flood from: %s@%s", current->ident, current->host);
+       Server->Logs->Log("USERS",DEFAULT,"Excess flood from: %s@%s", current->ident, current->host);
        Server->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
                        current->registered == REG_ALL ? current->nick : "",
                        current->registered == REG_ALL ? "!" : "", current->ident, current->host);
@@ -46,18 +46,18 @@ void ProcessUserHandler::Call(User* cu)
 
        char* ReadBuffer = Server->GetReadBuffer();
 
-       if (Server->Config->GetIOHook(cu->GetPort()))
+       if (cu->io)
        {
                int result2 = 0;
                int MOD_RESULT = 0;
 
                try
                {
-                       MOD_RESULT = Server->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->GetFd(),ReadBuffer,Server->Config->NetBufferSize,result2);
+                       MOD_RESULT = cu->io->OnRawSocketRead(cu->GetFd(),ReadBuffer,Server->Config->NetBufferSize,result2);
                }
                catch (CoreException& modexcept)
                {
-                       Server->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+                       Server->Logs->Log("USERS",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
                }
 
                if (MOD_RESULT < 0)
@@ -216,7 +216,7 @@ void InspIRCd::DoBackgroundUserStuff()
                        // This user didn't answer the last ping, remove them
                        if (!curr->lastping)
                        {
-                               time_t time = this->Time(false) - (curr->nping - curr->MyClass->GetPingTime());
+                               time_t time = this->Time() - (curr->nping - curr->MyClass->GetPingTime());
                                char message[MAXBUF];
                                snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : "");
                                curr->lastping = 1;