Annotations

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index ed5c4e7ae6717cbc6d3e1a06417dddfc9aec8e19..10da15292ae4c9098346a36fd2f88edcd01d50ed 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -18,36 +18,14 @@
 
 using namespace std;
 
-#include "inspircd_config.h"
 #include "configreader.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <time.h>
-#include <string>
-#include <ext/hash_map>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
 #include "wildcard.h"
-#include "mode.h"
-#include "commands.h"
 #include "xline.h"
-#include "inspstring.h"
-
-#include "hashcomp.h"
 #include "socketengine.h"
 #include "userprocess.h"
 #include "inspircd.h"
-#include "typedefs.h"
 #include "command_parse.h"
 #include "cull_list.h"
 
@@ -66,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)
                {
@@ -135,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;
                                        }
@@ -148,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);
                                }
@@ -165,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);
                                }
@@ -185,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;
                                }
@@ -195,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
@@ -345,3 +322,4 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
        /* Remove all the queued users who are due to be quit, free memory used. */
        GlobalGoners.Apply();
 }
+