* ---------------------------------------------------
*/
+#include "inspircd.h"
#include "configreader.h"
#include "users.h"
#include "modules.h"
#include "wildcard.h"
#include "xline.h"
#include "socketengine.h"
-#include "inspircd.h"
#include "command_parse.h"
+void InspIRCd::FloodQuitUser(userrec* current)
+{
+ this->Log(DEFAULT,"Excess flood from: %s@%s", current->ident, current->host);
+ this->SNO->WriteToSnoMask('f',"Excess flood from: %s%s%s@%s",
+ current->registered == REG_ALL ? current->nick : "",
+ current->registered == REG_ALL ? "!" : "", current->ident, current->host);
+ current->SetWriteError("Excess flood");
+ if (current->registered != REG_ALL)
+ {
+ XLines->add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString());
+ XLines->apply_lines(APPLY_ZLINES);
+ }
+}
+
void InspIRCd::ProcessUser(userrec* cu)
{
int result = EAGAIN;
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;
- }
+ if (current->flood && current->lines_in > current->flood)
+ 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)
- {
- 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);
- }
+ FloodQuitUser(current);
return;
}
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);
- current->SetWriteError("Excess flood");
+ 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);
- current->SetWriteError("Excess flood");
- }
- else
- {
- XLines->add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString());
- XLines->apply_lines(APPLY_ZLINES);
- }
-
+ 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);
+ 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 */
EventHandler* old_comp = this->SE->GetRef(currfd);
if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
{
- cu->SetWriteError(strerror(errno));
+ cu->SetWriteError(errno ? strerror(errno) : "EOF from client");
return;
}
}
}
else if (result == 0)
{
- cu->SetWriteError("Client exited");
+ cu->SetWriteError("Connection closed");
return;
}
}
{
/* Everybody loves boobies. */
time_t time = this->Time(false) - (curr->nping - curr->pingmax);
- std::string boobies = "Ping timeout: " + ConvToStr(time) + " second" + (time > 1 ? "s" : "");
+ char message[MAXBUF];
+ snprintf(message, MAXBUF, "Ping timeout: %ld second%s", time, time > 1 ? "s" : "");
curr->muted = true;
- GlobalCulls.AddItem(curr, boobies);
+ GlobalCulls.AddItem(curr, message);
curr->lastping = 1;
curr->nping = TIME+curr->pingmax;
continue;