* ---------------------------------------------------
*/
+/* $Core: libIRCDuserprocess */
+
#include "inspircd.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->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");
+ 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);
+ ZLine* zl = new ZLine(Server, Server->Time(), 0, Server->Config->ServerName, "Flood from unregistered connection", current->GetIPString());
+ if (Server->XLines->AddLine(zl))
+ Server->XLines->ApplyLines();
+ else
+ delete zl;
}
}
-void ProcessUserHandler::Call(userrec* cu)
+void ProcessUserHandler::Call(User* cu)
{
int result = EAGAIN;
try
{
- MOD_RESULT = Server->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->GetFd(),ReadBuffer,sizeof(ReadBuffer),result2);
+ MOD_RESULT = Server->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->GetFd(),ReadBuffer,Server->Config->NetBufferSize,result2);
}
catch (CoreException& modexcept)
{
if ((result) && (result != -EAGAIN))
{
- userrec *current;
+ User *current;
int currfd;
- int floodlines = 0;
Server->stats->statsRecv += result;
/*
// 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
+ if (current->MyClass)
{
- 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();
+ // Make sure they arn't flooding long lines.
+ if (Server->Time() > current->reset_due)
+ {
+ current->reset_due = Server->Time() + current->MyClass->GetThreshold();
+ current->lines_in = 0;
+ }
+
+ current->lines_in++;
+
+ if (current->MyClass->GetFlood() && current->lines_in > current->MyClass->GetFlood())
+ 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
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->OverPenalty)
+ Server->Parser->DoLines(current);
return;
}
if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
{
- userrec::QuitUser(Server, cu, errno ? strerror(errno) : "EOF from client");
+ User::QuitUser(Server, cu, errno ? strerror(errno) : "EOF from client");
return;
}
}
}
else if (result == 0)
{
- userrec::QuitUser(Server, cu, "Connection closed");
+ User::QuitUser(Server, 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 = local_users.begin(); count2 != 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;
- for (std::vector<userrec*>::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);
+ }
+ if (curr->OverPenalty)
+ {
+ if (curr->sendq.empty())
+ curr->OverPenalty = false;
+ }
+
+ if ((curr->registered != REG_ALL) && (TIME > curr->timeout))
+ {
/*
* 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)
- {
- 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;
- }
+ curr->muted = true;
+ User::QuitUser(this, curr, "Registration timeout");
+ continue;
+ }
- if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (ready))
+ /*
+ * `ready` means that the user has provided NICK/USER(/PASS), and all modules agree
+ * that the user is okay to proceed. The one thing we are then waiting for now is DNS...
+ */
+ bool ready = ((curr->registered == REG_NICKUSER) && AllModulesReportReady(curr));
+
+ if (ready)
+ {
+ if (curr->dns_done)
{
+ /* DNS passed, connect the user */
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);
- 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);
- 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)
+ // It's time to PING this user. Send them a ping.
+ if ((TIME > curr->nping) && (curr->registered == REG_ALL))
{
- next_call = TIME + 1;
- delta = 1;
+ // This user didn't answer the last ping, remove them
+ if (!curr->lastping)
+ {
+ time_t time = this->Time(false) - (curr->nping - curr->MyClass->GetPingTime());
+ 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->MyClass->GetPingTime();
+ User::QuitUser(this, curr, message);
+ continue;
+ }
+ curr->Write("PING :%s",this->Config->ServerName);
+ curr->lastping = 0;
+ curr->nping = TIME +curr->MyClass->GetPingTime();
}
}
}
projects / user / henk / code / inspircd.git / blobdiff