* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
+ * 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 "inspircd.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)
+void FloodQuitUserHandler::Call(User* current)
+{
+ Server->Log(DEFAULT,"Excess flood from: %s@%s", current->ident, current->host);
+ 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);
+ User::QuitUser(Server, 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);
+ }
+}
+
+void ProcessUserHandler::Call(User* cu)
{
int result = EAGAIN;
if (cu->GetFd() == FD_MAGIC_NUMBER)
return;
- if (this->Config->GetIOHook(cu->GetPort()))
+ char* ReadBuffer = Server->GetReadBuffer();
+
+ if (Server->Config->GetIOHook(cu->GetPort()))
{
int result2 = 0;
int MOD_RESULT = 0;
try
{
- MOD_RESULT = this->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->GetFd(),ReadBuffer,sizeof(ReadBuffer),result2);
+ MOD_RESULT = Server->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());
+ Server->Log(DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
}
if (MOD_RESULT < 0)
result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer));
}
- this->Log(DEBUG,"Read result: %d",result);
-
if ((result) && (result != -EAGAIN))
{
- userrec *current;
+ User *current;
int currfd;
int floodlines = 0;
- this->stats->statsRecv += result;
+ Server->stats->statsRecv += result;
/*
* perform a check on the raw buffer as an array (not a string!) to remove
* character 0 which is illegal in the RFC - replace them with spaces.
- * XXX - no garauntee there's not \0's in the middle of the data,
- * and no reason for it to be terminated either. -- Om
*/
for (int checker = 0; checker < result; checker++)
if (current->registered == REG_ALL)
{
// Make sure they arn't flooding long lines.
- if (TIME > current->reset_due)
+ if (Server->Time() > current->reset_due)
{
- current->reset_due = TIME + current->threshold;
+ current->reset_due = Server->Time() + current->threshold;
current->lines_in = 0;
}
current->lines_in++;
- if (current->lines_in > current->flood)
- {
- 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;
- }
+ 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 512chars) Please shorten it.", current->nick);
- current->recvq = "";
+ 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
- {
- this->WriteOpers("*** 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);
- }
-
- return;
- }
-
- if (current->recvq.length() > (unsigned)this->Config->NetBufferSize)
- {
- if (current->registered == REG_ALL)
- {
- userrec::QuitUser(this, current,"RecvQ exceeded");
- }
- else
- {
- this->WriteOpers("*** 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);
- }
+ Server->FloodQuitUser(current);
return;
}
// while there are complete lines to process...
while (current->BufferIsReady())
{
- if (TIME > current->reset_due)
+ if (Server->Time() > current->reset_due)
{
- current->reset_due = TIME + current->threshold;
+ current->reset_due = Server->Time() + current->threshold;
current->lines_in = 0;
}
- if (++current->lines_in > current->flood)
+ if (++current->lines_in > current->flood && current->flood)
{
- 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");
+ Server->FloodQuitUser(current);
return;
}
if ((++floodlines > current->flood) && (current->flood != 0))
{
- if (current->registered == REG_ALL)
- {
- 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
- {
- XLines->add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString());
- XLines->apply_lines(APPLY_ZLINES);
- }
-
+ Server->FloodQuitUser(current);
return;
}
std::string single_line = current->GetBuffer();
current->bytes_in += single_line.length();
current->cmds_in++;
- if (single_line.length() > 512)
- single_line.resize(512);
-
- EventHandler* old_comp = this->SE->GetRef(currfd);
-
- this->Parser->ProcessBuffer(single_line,current);
- /*
- * look for the user's record in case it's changed... if theyve quit,
- * we cant do anything more with their buffer, so bail.
- * there used to be an ugly, slow loop here. Now we have a reference
- * table, life is much easier (and FASTER)
- */
- EventHandler* new_comp = this->SE->GetRef(currfd);
- if (old_comp != new_comp)
- {
- return;
- }
- else
- {
- /* The user is still here, flush their buffer */
- current->FlushWriteBuf();
- }
+ 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);
}
return;
if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
{
- this->Log(DEBUG,"killing: %s",cu->nick);
- userrec::QuitUser(this,cu,strerror(errno));
+ User::QuitUser(Server, cu, errno ? strerror(errno) : "EOF from client");
return;
}
}
}
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");
+ User::QuitUser(Server, cu, "Connection closed");
return;
}
}
/**
* 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;
-
- userrec* curr = this->local_users[count2];
+ /* Time we actually need to call this again */
+ const time_t DUMMY_VALUE = 32768;
+ next_call = TIME + DUMMY_VALUE;
- if (curr)
+ for (std::vector<User*>::iterator count2 = local_users.begin(); count2 != local_users.end(); count2++)
{
+ User* curr = *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))
+ if ((TIME > curr->timeout) && (curr->registered != REG_ALL))
{
- this->Log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick);
- //ZapThisDns(curr->fd);
- GlobalGoners.AddItem(curr,"Registration timeout");
+ curr->muted = true;
+ User::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.
*/
- if ((TIME > curr->signon) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr)))
+ bool ready = AllModulesReportReady(curr);
+ if ((TIME > curr->signon) && (curr->registered == REG_NICKUSER) && (ready))
{
- curr->dns_done = true;
- //ZapThisDns(curr->fd);
+ if (!curr->dns_done)
+ {
+ 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(&GlobalGoners);
+ curr->FullConnect();
continue;
}
- if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr)))
+ else
+ {
+ if ((curr->registered == REG_NICKUSER) && (ready) && (next_call > curr->signon))
+ next_call = curr->signon;
+ }
+
+ if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (ready))
{
- this->Log(DEBUG,"dns done, registered=3, and modules ready, OK");
- curr->FullConnect(&GlobalGoners);
- //ZapThisDns(curr->fd);
+ 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)
{
- time_t last_activity = curr->nping - curr->pingmax;
- std::string boobies = "Ping timeout: " + ConvToStr(last_activity <= 0 ? curr->pingmax : last_activity) + " second(s)";
- GlobalGoners.AddItem(curr, boobies);
+ /* 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;
+ User::QuitUser(this, curr, message);
continue;
}
curr->Write("PING :%s",this->Config->ServerName);
curr->lastping = 0;
curr->nping = TIME+curr->pingmax;
}
-
- /*
- * 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())
+ else
{
- GlobalGoners.AddItem(curr,curr->GetWriteError());
- continue;
+ 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();
}
projects / user / henk / code / inspircd.git / blobdiff