* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 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.
* ---------------------------------------------------
*/
-/* $Core: libIRCDuserprocess */
+/* $Core */
#include "inspircd.h"
-#include "wildcard.h"
#include "xline.h"
#include "socketengine.h"
#include "command_parse.h"
void FloodQuitUserHandler::Call(User* current)
{
- Server->Logs->Log("USERS",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);
- User::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)
{
char* ReadBuffer = Server->GetReadBuffer();
- if (cu->io)
+ if (cu->GetIOHook())
{
int result2 = 0;
int MOD_RESULT = 0;
try
{
- MOD_RESULT = cu->io->OnRawSocketRead(cu->GetFd(),ReadBuffer,Server->Config->NetBufferSize,result2);
+ MOD_RESULT = cu->GetIOHook()->OnRawSocketRead(cu->GetFd(), ReadBuffer, Server->Config->NetBufferSize, result2);
}
catch (CoreException& modexcept)
{
}
else
{
- result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer));
+ result = cu->ReadData(ReadBuffer, Server->Config->NetBufferSize);
}
if ((result) && (result != -EAGAIN))
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)
- {
- if (current->MyClass)
- {
- // 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
- Server->FloodQuitUser(current);
-
+ Server->FloodQuitUser(current);
return;
}
/* If user is over penalty, dont process here, just build up */
- if (!current->OverPenalty)
+ if (current->Penalty < 10)
Server->Parser->DoLines(current);
return;
if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
{
- User::QuitUser(Server, cu, errno ? strerror(errno) : "EOF from client");
+ Server->Users->QuitUser(cu, errno ? strerror(errno) : "EOF from client");
return;
}
}
}
else if (result == 0)
{
- User::QuitUser(Server, cu, "Connection closed");
+ Server->Users->QuitUser(cu, "Connection closed");
return;
}
}
{
User *curr = *count2;
+ if (curr->quitting)
+ continue;
+
if (curr->Penalty)
{
curr->Penalty--;
Parser->DoLines(curr, true);
}
- if (curr->OverPenalty)
+ switch (curr->registered)
{
- if (curr->sendq.empty())
- curr->OverPenalty = false;
+ case REG_ALL:
+ if (TIME > curr->nping)
+ {
+ // 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;
+ }
+
+ 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)
+ {
+ /* User has sent NICK/USER, modules are okay, DNS finished. */
+ curr->FullConnect();
+ continue;
+ }
+ break;
}
- if ((curr->registered != REG_ALL) && (TIME > curr->timeout))
+ if (curr->registered != REG_ALL && (TIME > (curr->age + curr->MyClass->GetRegTimeout())))
{
/*
* registration timeout -- didnt send USER/NICK/HOST
* in the time specified in their connection class.
*/
- User::QuitUser(this, curr, "Registration timeout");
+ this->Users->QuitUser(curr, "Registration timeout");
continue;
}
-
- /*
- * `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;
- }
- }
-
- // 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 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();
- 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