* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
* ---------------------------------------------------
*/
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
-#include "wildcard.h"
+/* $Core */
+
+#include "inspircd.h"
#include "xline.h"
#include "socketengine.h"
-#include "inspircd.h"
#include "command_parse.h"
-void InspIRCd::ProcessUser(userrec* cu)
+void FloodQuitUserHandler::Call(User* current)
+{
+ 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.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)
+ {
+ 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(User* cu)
{
int result = EAGAIN;
if (cu->GetFd() == FD_MAGIC_NUMBER)
return;
- if (this->Config->GetIOHook(cu->GetPort()))
+ char* ReadBuffer = Server->GetReadBuffer();
+
+ if (cu->GetIOHook())
{
int result2 = 0;
int MOD_RESULT = 0;
try
{
- MOD_RESULT = this->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)
{
- this->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)
}
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;
- 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->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 (TIME > current->reset_due)
- {
- current->reset_due = 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);
- current->SetWriteError("Excess flood");
- return;
- }
- else
- {
- current->WriteServ("NOTICE %s :Your previous line was too long and was not delivered (Over 512chars) Please shorten it.", current->nick);
- current->recvq = "";
- }
- }
- 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)
- {
- current->SetWriteError("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)
- {
- current->reset_due = TIME + current->threshold;
- current->lines_in = 0;
- }
-
- 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);
- current->SetWriteError("Excess flood");
- 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);
- current->SetWriteError("Excess flood");
- }
- else
- {
- XLines->add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString());
- XLines->apply_lines(APPLY_ZLINES);
- }
-
- 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() > 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 (new_comp != old_comp)
- return;
- }
+ /* 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))
{
- cu->SetWriteError(strerror(errno));
+ Server->Users->QuitUser(cu, errno ? strerror(errno) : "EOF from client");
return;
}
}
}
else if (result == 0)
{
- cu->SetWriteError("Client exited");
+ Server->Users->QuitUser(cu, "Connection closed");
return;
}
}
* 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<User*>::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;
-
- /* 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++)
- {
- if (count2 >= this->local_users.size())
- break;
+ User *curr = *count2;
- userrec* curr = this->local_users[count2];
+ if (curr->quitting)
+ continue;
- if (curr)
- {
- /*
- * registration timeout -- didnt send USER/NICK/HOST
- * in the time specified in their connection class.
- */
- if ((TIME > curr->timeout) && (curr->registered != REG_ALL))
- {
- GlobalCulls.AddItem(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))
- {
- 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;
- }
+ if (curr->Penalty)
+ {
+ curr->Penalty--;
+ if (curr->Penalty < 10)
+ Parser->DoLines(curr, true);
+ }
- // It's time to PING this user. Send them a ping.
- if ((TIME > curr->nping) && (curr->registered == REG_ALL))
+ switch (curr->registered)
+ {
+ case REG_ALL:
+ if (TIME > curr->nping)
{
// 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" : "");
- GlobalCulls.AddItem(curr, boobies);
+ 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->pingmax;
+ curr->nping = TIME + curr->MyClass->GetPingTime();
+ this->Users->QuitUser(curr, message);
continue;
}
+
curr->Write("PING :%s",this->Config->ServerName);
curr->lastping = 0;
- curr->nping = TIME+curr->pingmax;
+ curr->nping = TIME +curr->MyClass->GetPingTime();
}
- else
+ break;
+ case REG_NICKUSER:
+ if (AllModulesReportReady(curr) && curr->dns_done)
{
- if ((curr->registered == REG_ALL) && (next_call > curr->nping))
- next_call = curr->nping;
+ /* User has sent NICK/USER, modules are okay, DNS finished. */
+ curr->FullConnect();
+ continue;
}
- }
+ 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;
}
}
}
+
projects / user / henk / code / inspircd.git / blobdiff