X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=aaaf137105223923b1d536755162b7fa03f9fd0f;hb=1b7c615062a7b203c7fc3ce4c56e16eb671f7c15;hp=4d0f38b7caa8b908ee24ee6719acb9dc284c2810;hpb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 4d0f38b7c..aaaf13710 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -18,55 +18,24 @@ using namespace std; -#include "inspircd_config.h" #include "configreader.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #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 "helperfuncs.h" -#include "hashcomp.h" #include "socketengine.h" #include "userprocess.h" #include "inspircd.h" -#include "typedefs.h" #include "command_parse.h" #include "cull_list.h" -extern struct sockaddr_in client,server; -extern socklen_t length; - -extern time_t TIME; -extern time_t OLDTIME; -char data[65536]; - void InspIRCd::ProcessUser(userrec* cu) { int result = EAGAIN; - if (cu->fd == FD_MAGIC_NUMBER) + if (cu->GetFd() == FD_MAGIC_NUMBER) return; - log(DEBUG,"Processing user with fd %d",cu->fd); - if (this->Config->GetIOHook(cu->GetPort())) { int result2 = 0; @@ -74,12 +43,12 @@ void InspIRCd::ProcessUser(userrec* cu) try { - MOD_RESULT = this->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->fd,data,65535,result2); - log(DEBUG,"Data result returned by module: %d",MOD_RESULT); + 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) { - log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); + this->Log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); } if (MOD_RESULT < 0) @@ -93,10 +62,10 @@ void InspIRCd::ProcessUser(userrec* cu) } else { - result = cu->ReadData(data, 65535); + result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer)); } - log(DEBUG,"Read result: %d",result); + this->Log(DEBUG,"Read result: %d",result); if ((result) && (result != -EAGAIN)) { @@ -114,20 +83,20 @@ void InspIRCd::ProcessUser(userrec* cu) for (int checker = 0; checker < result; checker++) { - if (data[checker] == 0) - data[checker] = ' '; + if (ReadBuffer[checker] == 0) + ReadBuffer[checker] = ' '; } if (result > 0) - data[result] = '\0'; + ReadBuffer[result] = '\0'; current = cu; - currfd = current->fd; + currfd = current->GetFd(); // add the data to the users buffer if (result > 0) { - if (!current->AddBuffer(data)) + if (!current->AddBuffer(ReadBuffer)) { // AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good. if (current->registered == REG_ALL) @@ -143,8 +112,8 @@ void InspIRCd::ProcessUser(userrec* cu) if (current->lines_in > current->flood) { - 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->Log(DEFAULT,"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; } @@ -157,9 +126,9 @@ void InspIRCd::ProcessUser(userrec* cu) else { this->WriteOpers("*** Excess flood from %s",current->GetIPString()); - log(DEFAULT,"Excess flood from: %s",current->GetIPString()); - add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString()); - apply_lines(APPLY_ZLINES); + 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); } return; @@ -174,9 +143,9 @@ void InspIRCd::ProcessUser(userrec* cu) else { this->WriteOpers("*** Excess flood from %s",current->GetIPString()); - log(DEFAULT,"Excess flood from: %s",current->GetIPString()); - add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString()); - apply_lines(APPLY_ZLINES); + 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); } return; @@ -193,8 +162,8 @@ void InspIRCd::ProcessUser(userrec* cu) if (++current->lines_in > current->flood) { - 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->Log(DEFAULT,"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; } @@ -203,14 +172,14 @@ void InspIRCd::ProcessUser(userrec* cu) { if (current->registered == REG_ALL) { - 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->Log(DEFAULT,"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 { - add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString()); - apply_lines(APPLY_ZLINES); + XLines->add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString()); + XLines->apply_lines(APPLY_ZLINES); } return; @@ -223,7 +192,7 @@ void InspIRCd::ProcessUser(userrec* cu) if (single_line.length() > 512) single_line.resize(512); - userrec* old_comp = this->fd_ref_table[currfd]; + EventHandler* old_comp = this->SE->GetRef(currfd); this->Parser->ProcessBuffer(single_line,current); /* @@ -232,8 +201,8 @@ void InspIRCd::ProcessUser(userrec* cu) * there used to be an ugly, slow loop here. Now we have a reference * table, life is much easier (and FASTER) */ - userrec* new_comp = this->fd_ref_table[currfd]; - if ((currfd < 0) || (!this->fd_ref_table[currfd]) || (old_comp != new_comp)) + EventHandler* new_comp = this->SE->GetRef(currfd); + if (old_comp != new_comp) { return; } @@ -249,7 +218,7 @@ void InspIRCd::ProcessUser(userrec* cu) if ((result == -1) && (errno != EAGAIN) && (errno != EINTR)) { - log(DEBUG,"killing: %s",cu->nick); + this->Log(DEBUG,"killing: %s",cu->nick); userrec::QuitUser(this,cu,strerror(errno)); return; } @@ -262,37 +231,13 @@ void InspIRCd::ProcessUser(userrec* cu) } else if (result == 0) { - log(DEBUG,"InspIRCd: Exited: %s",cu->nick); + this->Log(DEBUG,"InspIRCd: Exited: %s",cu->nick); userrec::QuitUser(this,cu,"Client exited"); - log(DEBUG,"Bailing from client exit"); + this->Log(DEBUG,"Bailing from client exit"); return; } } -void InspIRCd::DoSocketTimeouts(time_t TIME) -{ - unsigned int numsockets = this->module_sockets.size(); - SocketEngine* SE = this->SE; - - for (std::vector::iterator a = this->module_sockets.begin(); a < this->module_sockets.end(); a++) - { - InspSocket* s = (InspSocket*)*a; - if ((s) && (s->GetFd() >= 0) && (s->GetFd() < MAX_DESCRIPTORS) && (this->socket_ref[s->GetFd()] != NULL) && (s->Timeout(TIME))) - { - log(DEBUG,"userprocess.cpp: Socket poll returned false, close and bail"); - this->socket_ref[s->GetFd()] = NULL; - SE->DelFd(s->GetFd()); - 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. @@ -319,7 +264,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME) */ if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != REG_ALL)) { - log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); + this->Log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); //ZapThisDns(curr->fd); GlobalGoners.AddItem(curr,"Registration timeout"); continue; @@ -338,7 +283,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME) } if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr))) { - log(DEBUG,"dns done, registered=3, and modules ready, OK"); + this->Log(DEBUG,"dns done, registered=3, and modules ready, OK"); curr->FullConnect(&GlobalGoners); //ZapThisDns(curr->fd); continue; @@ -378,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(); } +