X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuserprocess.cpp;h=1d21871655f758e8d1aa9209caa926bbbb237c46;hb=ddb970dd670bcd905c8f34458f8fcf70e9fd89bd;hp=1a5d7f2f77af256148185db8fad19be3e835dd33;hpb=1d1cfde1eea889e8853a0524bd27b20008add178;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/userprocess.cpp b/src/userprocess.cpp index 1a5d7f2f7..1d2187165 100644 --- a/src/userprocess.cpp +++ b/src/userprocess.cpp @@ -2,32 +2,23 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -/* Now with added unF! ;) */ - -using namespace std; - #include "configreader.h" #include "users.h" #include "modules.h" #include "wildcard.h" #include "xline.h" #include "socketengine.h" -#include "userprocess.h" #include "inspircd.h" #include "command_parse.h" -#include "cull_list.h" void InspIRCd::ProcessUser(userrec* cu) { @@ -45,9 +36,9 @@ void InspIRCd::ProcessUser(userrec* cu) { MOD_RESULT = this->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->GetFd(),ReadBuffer,sizeof(ReadBuffer),result2); } - catch (ModuleException& modexcept) + catch (CoreException& modexcept) { - this->Log(DEBUG,"Module exception caught: %s",modexcept.GetReason()); + this->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason()); } if (MOD_RESULT < 0) @@ -64,8 +55,6 @@ void InspIRCd::ProcessUser(userrec* cu) result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer)); } - this->Log(DEBUG,"Read result: %d",result); - if ((result) && (result != -EAGAIN)) { userrec *current; @@ -113,7 +102,7 @@ void InspIRCd::ProcessUser(userrec* cu) { 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"); + current->SetWriteError("Excess flood"); return; } else @@ -137,7 +126,7 @@ void InspIRCd::ProcessUser(userrec* cu) { if (current->registered == REG_ALL) { - userrec::QuitUser(this, current,"RecvQ exceeded"); + current->SetWriteError("RecvQ exceeded"); } else { @@ -163,7 +152,7 @@ void InspIRCd::ProcessUser(userrec* cu) { 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"); + current->SetWriteError("Excess flood"); return; } @@ -173,7 +162,7 @@ void InspIRCd::ProcessUser(userrec* cu) { 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"); + current->SetWriteError("Excess flood"); } else { @@ -201,15 +190,9 @@ void InspIRCd::ProcessUser(userrec* cu) * table, life is much easier (and FASTER) */ EventHandler* new_comp = this->SE->GetRef(currfd); - if (old_comp != new_comp) - { + + if (new_comp != old_comp) return; - } - else - { - /* The user is still here, flush their buffer */ - current->FlushWriteBuf(); - } } return; @@ -217,8 +200,7 @@ void InspIRCd::ProcessUser(userrec* cu) if ((result == -1) && (errno != EAGAIN) && (errno != EINTR)) { - this->Log(DEBUG,"killing: %s",cu->nick); - userrec::QuitUser(this,cu,strerror(errno)); + cu->SetWriteError(strerror(errno)); return; } } @@ -230,9 +212,7 @@ void InspIRCd::ProcessUser(userrec* cu) } else if (result == 0) { - this->Log(DEBUG,"InspIRCd: Exited: %s",cu->nick); - userrec::QuitUser(this,cu,"Client exited"); - this->Log(DEBUG,"Bailing from client exit"); + cu->SetWriteError("Client exited"); return; } } @@ -240,89 +220,107 @@ void InspIRCd::ProcessUser(userrec* cu) /** * This function is called once a second from the mainloop. * It is intended to do background checking on all the user structs, e.g. - * stuff like ping checks, registration timeouts, etc. This function is - * also responsible for checking if InspSocket derived classes are timed out. + * stuff like ping checks, registration timeouts, etc. */ void InspIRCd::DoBackgroundUserStuff(time_t TIME) { - CullList GlobalGoners(this); - - /* XXX: IT IS NOT SAFE TO USE AN ITERATOR HERE. DON'T EVEN THINK ABOUT IT. */ - for (unsigned long count2 = 0; count2 != this->local_users.size(); count2++) + /* Is it time yet? */ + if (TIME < next_call) + return; + else { - if (count2 >= this->local_users.size()) - break; + /* Time we actually need to call this again */ + const time_t DUMMY_VALUE = 32768; + next_call = TIME + DUMMY_VALUE; - userrec* curr = this->local_users[count2]; - - if (curr) + /* XXX: IT IS NOT SAFE TO USE AN ITERATOR HERE. DON'T EVEN THINK ABOUT IT. */ + for (unsigned long count2 = 0; count2 != this->local_users.size(); count2++) { - /* - * registration timeout -- didnt send USER/NICK/HOST - * in the time specified in their connection class. - */ - if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != REG_ALL)) - { - this->Log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick); - //ZapThisDns(curr->fd); - GlobalGoners.AddItem(curr,"Registration timeout"); - continue; - } - /* - * 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. - */ - if ((TIME > curr->signon) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr))) - { - curr->dns_done = true; - //ZapThisDns(curr->fd); - this->stats->statsDnsBad++; - curr->FullConnect(&GlobalGoners); - continue; - } - if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr))) - { - this->Log(DEBUG,"dns done, registered=3, and modules ready, OK"); - curr->FullConnect(&GlobalGoners); - //ZapThisDns(curr->fd); - continue; - } - // It's time to PING this user. Send them a ping. - if ((TIME > curr->nping) && (curr->registered == REG_ALL)) + if (count2 >= this->local_users.size()) + break; + + userrec* curr = this->local_users[count2]; + + if (curr) { - // This user didn't answer the last ping, remove them - if (!curr->lastping) + /* + * registration timeout -- didnt send USER/NICK/HOST + * in the time specified in their connection class. + */ + if ((TIME > curr->timeout) && (curr->registered != REG_ALL)) { - time_t last_activity = curr->nping - curr->pingmax; - /* Everybody loves boobies. */ - std::string boobies = "Ping timeout: " + ConvToStr(last_activity <= 0 ? curr->pingmax : last_activity) + " second(s)"; - GlobalGoners.AddItem(curr, boobies); - curr->lastping = 1; - curr->nping = TIME+curr->pingmax; + curr->muted = true; + GlobalCulls.AddItem(curr,"Registration timeout"); continue; } - curr->Write("PING :%s",this->Config->ServerName); - curr->lastping = 0; - curr->nping = TIME+curr->pingmax; - } + else + { + if ((curr->registered != REG_ALL) && (next_call > (time_t)curr->timeout)) + next_call = curr->timeout; + } - /* - * We can flush the write buffer as the last thing we do, because if they - * match any of the above conditions its no use flushing their buffer anyway. - */ - - curr->FlushWriteBuf(); - if (*curr->GetWriteError()) - { - GlobalGoners.AddItem(curr,curr->GetWriteError()); - continue; + /* + * 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)) + { + 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; + } + + // 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) + { + /* Everybody loves boobies. */ + time_t time = this->Time(false) - (curr->nping - curr->pingmax); + std::string boobies = "Ping timeout: " + ConvToStr(time) + " second" + (time > 1 ? "s" : ""); + curr->muted = true; + GlobalCulls.AddItem(curr, boobies); + curr->lastping = 1; + curr->nping = TIME+curr->pingmax; + 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; + } } } + /* If theres nothing to do, trigger in the next second, something might come up */ + time_t delta = next_call - TIME; + if (delta == DUMMY_VALUE) + { + next_call = TIME + 1; + delta = 1; + } } - - - /* Remove all the queued users who are due to be quit, free memory used. */ - GlobalGoners.Apply(); } -