Merge guestpattern fix by peaveydk

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index c104892521e1b85d9aba681110d04a94906ebc3b..cb204989d7a45595763e28c8f1ffac6ae9d6697d 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -44,7 +44,6 @@ void InspIRCd::ProcessUser(userrec* cu)
                try
                {
                        MOD_RESULT = this->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->GetFd(),ReadBuffer,sizeof(ReadBuffer),result2);
-                       this->Log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
                }
                catch (ModuleException& modexcept)
                {
@@ -113,7 +112,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                        if (current->lines_in > current->flood)
                                        {
                                                this->Log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
-                                               this->WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
+                                               this->SNO->WriteToSnoMask('f',"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
                                                userrec::QuitUser(this, current,"Excess flood");
                                                return;
                                        }
@@ -126,7 +125,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                else
                                {
                                        this->WriteOpers("*** Excess flood from %s",current->GetIPString());
-                                       this->Log(DEFAULT,"Excess flood from: %s",current->GetIPString());
+                                       this->SNO->WriteToSnoMask('f',"Excess flood from: %s",current->GetIPString());
                                        XLines->add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString());
                                        XLines->apply_lines(APPLY_ZLINES);
                                }
@@ -143,7 +142,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                else
                                {
                                        this->WriteOpers("*** Excess flood from %s",current->GetIPString());
-                                       this->Log(DEFAULT,"Excess flood from: %s",current->GetIPString());
+                                       this->SNO->WriteToSnoMask('f',"Excess flood from: %s",current->GetIPString());
                                        XLines->add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString());
                                        XLines->apply_lines(APPLY_ZLINES);
                                }
@@ -163,7 +162,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                if (++current->lines_in > current->flood)
                                {
                                        this->Log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
-                                       WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
+                                       this->SNO->WriteToSnoMask('f',"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
                                        userrec::QuitUser(this, current,"Excess flood");
                                        return;
                                }
@@ -173,7 +172,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                        if (current->registered == REG_ALL)
                                        {
                                                this->Log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
-                                               WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
+                                               SNO->WriteToSnoMask('f',"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
                                                userrec::QuitUser(this, current,"Excess flood");
                                        }
                                        else
@@ -294,7 +293,10 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                                // This user didn't answer the last ping, remove them
                                if (!curr->lastping)
                                {
-                                       GlobalGoners.AddItem(curr,"Ping timeout");
+                                       /* Everybody loves boobies. */
+                                       time_t time = this->Time() - (curr->nping - curr->pingmax);
+                                       std::string boobies = "Ping timeout: " + ConvToStr(time) + " second" + (time > 1 ? "s" : ""); 
+                                       GlobalGoners.AddItem(curr, boobies);
                                        curr->lastping = 1;
                                        curr->nping = TIME+curr->pingmax;
                                        continue;
@@ -323,3 +325,4 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
        /* Remove all the queued users who are due to be quit, free memory used. */
        GlobalGoners.Apply();
 }
+