X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuserprocess.cpp;h=88c12a57b6d346cda7676b738cad2e8b78ae1a81;hb=1cb625e2a216704f9e59f2b9cfb2b0611e4f12f5;hp=78a0bc31f63bc59d13b8f3328a73248fa87ef2ad;hpb=156c232d1d22568d20ec498c4bd344bf03052e4a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 78a0bc31f..88c12a57b 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,30 +11,32 @@ * --------------------------------------------------- */ +/* $Core */ + #include "inspircd.h" -#include "configreader.h" -#include "users.h" -#include "modules.h" -#include "wildcard.h" #include "xline.h" #include "socketengine.h" #include "command_parse.h" -void FloodQuitUserHandler::Call(userrec* current) +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.c_str(), current->host.c_str()); 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); - userrec::QuitUser(Server, current, "Excess flood"); + current->registered == REG_ALL ? current->nick.c_str() : "", + current->registered == REG_ALL ? "!" : "", current->ident.c_str(), current->host.c_str()); + Server->Users->QuitUser(current, "Excess flood"); + if (current->registered != REG_ALL) { - Server->XLines->add_zline(120, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString()); - Server->XLines->apply_lines(APPLY_ZLINES); + ZLine* zl = new ZLine(Server, Server->Time(), 0, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString()); + if (Server->XLines->AddLine(zl,NULL)) + Server->XLines->ApplyLines(); + else + delete zl; } } -void ProcessUserHandler::Call(userrec* cu) +void ProcessUserHandler::Call(User* cu) { int result = EAGAIN; @@ -43,18 +45,18 @@ void ProcessUserHandler::Call(userrec* cu) char* ReadBuffer = Server->GetReadBuffer(); - if (Server->Config->GetIOHook(cu->GetPort())) + if (cu->GetIOHook()) { int result2 = 0; int MOD_RESULT = 0; try { - MOD_RESULT = Server->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->GetFd(),ReadBuffer,sizeof(ReadBuffer),result2); + MOD_RESULT = cu->GetIOHook()->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) @@ -68,14 +70,13 @@ void ProcessUserHandler::Call(userrec* cu) } else { - result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer)); + result = cu->ReadData(ReadBuffer, Server->Config->NetBufferSize); } if ((result) && (result != -EAGAIN)) { - userrec *current; + User *current; int currfd; - int floodlines = 0; Server->stats->statsRecv += result; /* @@ -101,68 +102,20 @@ void ProcessUserHandler::Call(userrec* cu) 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) - { - // Make sure they arn't flooding long lines. - if (Server->Time() > current->reset_due) - { - current->reset_due = Server->Time() + current->threshold; - current->lines_in = 0; - } - - current->lines_in++; - - if (current->flood && current->lines_in > current->flood) - Server->FloodQuitUser(current); - else - { - current->WriteServ("NOTICE %s :Your previous line was too long and was not delivered (Over %d chars) Please shorten it.", current->nick, MAXBUF-2); - current->recvq.clear(); - } - } - else - Server->FloodQuitUser(current); - + Server->FloodQuitUser(current); return; } - // while there are complete lines to process... - while (current->BufferIsReady()) - { - if (Server->Time() > current->reset_due) - { - current->reset_due = Server->Time() + current->threshold; - current->lines_in = 0; - } - - if (++current->lines_in > current->flood && current->flood) - { - Server->FloodQuitUser(current); - return; - } - - if ((++floodlines > current->flood) && (current->flood != 0)) - { - Server->FloodQuitUser(current); - return; - } - - // use GetBuffer to copy single lines into the sanitized string - std::string single_line = current->GetBuffer(); - current->bytes_in += single_line.length(); - current->cmds_in++; - if (single_line.length() > MAXBUF - 2) /* MAXBUF is 514 to allow for neccessary line terminators */ - single_line.resize(MAXBUF - 2); /* So to trim to 512 here, we use MAXBUF - 2 */ - - Server->Parser->ProcessBuffer(single_line, current); - } + /* If user is over penalty, dont process here, just build up */ + if (current->Penalty < 10) + Server->Parser->DoLines(current); return; } if ((result == -1) && (errno != EAGAIN) && (errno != EINTR)) { - userrec::QuitUser(Server, cu, errno ? strerror(errno) : "EOF from client"); + Server->Users->QuitUser(cu, errno ? strerror(errno) : "EOF from client"); return; } } @@ -174,7 +127,7 @@ void ProcessUserHandler::Call(userrec* cu) } else if (result == 0) { - userrec::QuitUser(Server, cu, "Connection closed"); + Server->Users->QuitUser(cu, "Connection closed"); return; } } @@ -184,102 +137,65 @@ void ProcessUserHandler::Call(userrec* cu) * It is intended to do background checking on all the user structs, e.g. * stuff like ping checks, registration timeouts, etc. */ -void InspIRCd::DoBackgroundUserStuff(time_t TIME) +void InspIRCd::DoBackgroundUserStuff() { - /* Is it time yet? */ - if (TIME < next_call) - return; - else + /* + * loop over all local users.. + */ + for (std::vector::iterator count2 = this->Users->local_users.begin(); count2 != this->Users->local_users.end(); count2++) { - /* Time we actually need to call this again */ - const time_t DUMMY_VALUE = 32768; - next_call = TIME + DUMMY_VALUE; + User *curr = *count2; + + if (curr->quitting) + continue; - for (std::vector::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++) + if (curr->Penalty) { - userrec* curr = *count2; + curr->Penalty--; + if (curr->Penalty < 10) + Parser->DoLines(curr, true); + } - /* - * registration timeout -- didnt send USER/NICK/HOST - * in the time specified in their connection class. - */ - if ((TIME > curr->timeout) && (curr->registered != REG_ALL)) - { - curr->muted = true; - userrec::QuitUser(this, curr, "Registration timeout"); - continue; - } - else - { - if ((curr->registered != REG_ALL) && (next_call > (time_t)curr->timeout)) - next_call = curr->timeout; - } - /* - * user has signed on with USER/NICK/PASS, and dns has completed, all the modules - * say this user is ok to proceed, fully connect them. - */ - bool ready = AllModulesReportReady(curr); - if ((TIME > curr->signon) && (curr->registered == REG_NICKUSER) && (ready)) - { - if (!curr->dns_done) + switch (curr->registered) + { + case REG_ALL: + if (TIME > curr->nping) { - curr->WriteServ("NOTICE Auth :*** Could not resolve your hostname: Request timed out; using your IP address (%s) instead.", curr->GetIPString()); - curr->dns_done = true; - } - this->stats->statsDnsBad++; - curr->FullConnect(); - continue; - } - else - { - if ((curr->registered == REG_NICKUSER) && (ready) && (next_call > curr->signon)) - next_call = curr->signon; - } - - if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (ready)) - { - curr->FullConnect(); - continue; - } - else - { - if ((curr->registered == REG_NICKUSER) && (ready) && (next_call > curr->signon + this->Config->dns_timeout)) - next_call = curr->signon + this->Config->dns_timeout; - } + // This user didn't answer the last ping, remove them + if (!curr->lastping) + { + 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; + curr->nping = TIME + curr->MyClass->GetPingTime(); + this->Users->QuitUser(curr, message); + continue; + } - // It's time to PING this user. Send them a ping. - if ((TIME > curr->nping) && (curr->registered == REG_ALL)) - { - // This user didn't answer the last ping, remove them - if (!curr->lastping) + curr->Write("PING :%s",this->Config->ServerName); + curr->lastping = 0; + curr->nping = TIME +curr->MyClass->GetPingTime(); + } + break; + case REG_NICKUSER: + if (AllModulesReportReady(curr) && curr->dns_done) { - /* Everybody loves boobies. */ - time_t time = this->Time(false) - (curr->nping - curr->pingmax); - char message[MAXBUF]; - snprintf(message, MAXBUF, "Ping timeout: %ld second%s", (long)time, time > 1 ? "s" : ""); - curr->muted = true; - curr->lastping = 1; - curr->nping = TIME+curr->pingmax; - userrec::QuitUser(this, curr, message); + /* User has sent NICK/USER, modules are okay, DNS finished. */ + curr->FullConnect(); continue; } - curr->Write("PING :%s",this->Config->ServerName); - curr->lastping = 0; - curr->nping = TIME+curr->pingmax; - } - else - { - if ((curr->registered == REG_ALL) && (next_call > curr->nping)) - next_call = curr->nping; - } + break; } - /* If theres nothing to do, trigger in the next second, something might come up */ - time_t delta = next_call - TIME; - if (delta == DUMMY_VALUE) + if (curr->registered != REG_ALL && (TIME > (curr->age + curr->MyClass->GetRegTimeout()))) { - next_call = TIME + 1; - delta = 1; + /* + * registration timeout -- didnt send USER/NICK/HOST + * in the time specified in their connection class. + */ + this->Users->QuitUser(curr, "Registration timeout"); + continue; } } }