X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=aaaf137105223923b1d536755162b7fa03f9fd0f;hb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;hp=aa16bd90ee4f6e500a532f6cf67d3a399358036b;hpb=e381b06561228aaea752deda20a62c6dc99a560e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index aa16bd90e..aaaf13710 100644
--- 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"
 
@@ -135,7 +113,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 +126,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 +143,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 +163,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 +173,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
@@ -260,29 +238,6 @@ void InspIRCd::ProcessUser(userrec* cu)
 	}
 }
 
-void InspIRCd::DoSocketTimeouts(time_t TIME)
-{
-	unsigned int numsockets = this->module_sockets.size();
-
-	for (std::vector<InspSocket*>::iterator a = this->module_sockets.begin(); a < this->module_sockets.end(); a++)
-	{
-		InspSocket* s = *a;
-		int fd = s->GetFd();
-		if ((s) && (fd >= 0) && (fd < MAX_DESCRIPTORS) && (this->SE->GetRef(fd) == s) && (s->Timeout(TIME)))
-		{
-			this->Log(DEBUG,"userprocess.cpp: Socket poll returned false, close and bail");
-			SE->DelFd(s);
-			this->module_sockets.erase(a);
-			s->Close();
-			DELETE(s);
-			break;
-		}
-
-		if (this->module_sockets.size() != numsockets)
-			break;
-	}
-}
-
 /**
  * This function is called once a second from the mainloop.
  * It is intended to do background checking on all the user structs, e.g.
@@ -368,3 +323,4 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
 	/* Remove all the queued users who are due to be quit, free memory used. */
 	GlobalGoners.Apply();
 }
+