using namespace std;
#include "inspircd_config.h"
-#include "inspircd.h"
#include "configreader.h"
#include <unistd.h>
#include <fcntl.h>
#include "modules.h"
#include "dynamic.h"
#include "wildcard.h"
-#include "message.h"
#include "mode.h"
#include "commands.h"
#include "xline.h"
#include "inspstring.h"
-#include "helperfuncs.h"
+
#include "hashcomp.h"
#include "socketengine.h"
#include "userprocess.h"
+#include "inspircd.h"
#include "typedefs.h"
#include "command_parse.h"
#include "cull_list.h"
-extern struct sockaddr_in client,server;
-extern socklen_t length;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-extern time_t TIME;
-extern time_t OLDTIME;
-char data[65536];
-
void InspIRCd::ProcessUser(userrec* cu)
{
int result = EAGAIN;
- if (cu->fd == FD_MAGIC_NUMBER)
+ if (cu->GetFd() == FD_MAGIC_NUMBER)
return;
- log(DEBUG,"Processing user with fd %d",cu->fd);
-
if (this->Config->GetIOHook(cu->GetPort()))
{
int result2 = 0;
try
{
- MOD_RESULT = this->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->fd,data,65535,result2);
- log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
+ MOD_RESULT = this->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->GetFd(),ReadBuffer,sizeof(ReadBuffer),result2);
+ this->Log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
}
catch (ModuleException& modexcept)
{
- log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
+ this->Log(DEBUG,"Module exception caught: %s",modexcept.GetReason());
}
if (MOD_RESULT < 0)
}
else
{
- result = cu->ReadData(data, 65535);
+ result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer));
}
- log(DEBUG,"Read result: %d",result);
+ this->Log(DEBUG,"Read result: %d",result);
if ((result) && (result != -EAGAIN))
{
for (int checker = 0; checker < result; checker++)
{
- if (data[checker] == 0)
- data[checker] = ' ';
+ if (ReadBuffer[checker] == 0)
+ ReadBuffer[checker] = ' ';
}
if (result > 0)
- data[result] = '\0';
+ ReadBuffer[result] = '\0';
current = cu;
- currfd = current->fd;
+ currfd = current->GetFd();
// add the data to the users buffer
if (result > 0)
{
- if (!current->AddBuffer(data))
+ 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->lines_in > current->flood)
{
- log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
- WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
- userrec::QuitUser(current,"Excess flood");
+ this->Log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
+ this->WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
+ userrec::QuitUser(this, current,"Excess flood");
return;
}
else
}
else
{
- WriteOpers("*** Excess flood from %s",current->GetIPString());
- log(DEFAULT,"Excess flood from: %s",current->GetIPString());
- add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString());
- apply_lines(APPLY_ZLINES);
+ this->WriteOpers("*** Excess flood from %s",current->GetIPString());
+ this->Log(DEFAULT,"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->registered == REG_ALL)
{
- userrec::QuitUser(current,"RecvQ exceeded");
+ userrec::QuitUser(this, current,"RecvQ exceeded");
}
else
{
- WriteOpers("*** Excess flood from %s",current->GetIPString());
- log(DEFAULT,"Excess flood from: %s",current->GetIPString());
- add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString());
- apply_lines(APPLY_ZLINES);
+ this->WriteOpers("*** Excess flood from %s",current->GetIPString());
+ this->Log(DEFAULT,"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->lines_in > current->flood)
{
- log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
+ this->Log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
- userrec::QuitUser(current,"Excess flood");
+ userrec::QuitUser(this, current,"Excess flood");
return;
}
{
if (current->registered == REG_ALL)
{
- log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
+ this->Log(DEFAULT,"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
- userrec::QuitUser(current,"Excess flood");
+ userrec::QuitUser(this, current,"Excess flood");
}
else
{
- add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString());
- apply_lines(APPLY_ZLINES);
+ XLines->add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString());
+ XLines->apply_lines(APPLY_ZLINES);
}
return;
if (single_line.length() > 512)
single_line.resize(512);
- userrec* old_comp = this->fd_ref_table[currfd];
+ EventHandler* old_comp = this->SE->GetRef(currfd);
this->Parser->ProcessBuffer(single_line,current);
/*
* there used to be an ugly, slow loop here. Now we have a reference
* table, life is much easier (and FASTER)
*/
- userrec* new_comp = this->fd_ref_table[currfd];
- if ((currfd < 0) || (!this->fd_ref_table[currfd]) || (old_comp != new_comp))
+ EventHandler* new_comp = this->SE->GetRef(currfd);
+ if (old_comp != new_comp)
{
return;
}
if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
{
- log(DEBUG,"killing: %s",cu->nick);
- userrec::QuitUser(cu,strerror(errno));
+ this->Log(DEBUG,"killing: %s",cu->nick);
+ userrec::QuitUser(this,cu,strerror(errno));
return;
}
}
}
else if (result == 0)
{
- log(DEBUG,"InspIRCd: Exited: %s",cu->nick);
- userrec::QuitUser(cu,"Client exited");
- log(DEBUG,"Bailing from client exit");
+ this->Log(DEBUG,"InspIRCd: Exited: %s",cu->nick);
+ userrec::QuitUser(this,cu,"Client exited");
+ this->Log(DEBUG,"Bailing from client exit");
return;
}
}
void InspIRCd::DoSocketTimeouts(time_t TIME)
{
unsigned int numsockets = this->module_sockets.size();
- SocketEngine* SE = this->SE;
for (std::vector<InspSocket*>::iterator a = this->module_sockets.begin(); a < this->module_sockets.end(); a++)
{
- InspSocket* s = (InspSocket*)*a;
- if ((s) && (s->GetFd() >= 0) && (s->GetFd() < MAX_DESCRIPTORS) && (this->socket_ref[s->GetFd()] != NULL) && (s->Timeout(TIME)))
+ InspSocket* s = *a;
+ int fd = s->GetFd();
+ if ((s) && (fd >= 0) && (fd < MAX_DESCRIPTORS) && (this->SE->GetRef(fd) == s) && (s->Timeout(TIME)))
{
- log(DEBUG,"userprocess.cpp: Socket poll returned false, close and bail");
- this->socket_ref[s->GetFd()] = NULL;
- SE->DelFd(s->GetFd());
+ this->Log(DEBUG,"userprocess.cpp: Socket poll returned false, close and bail");
+ SE->DelFd(s);
this->module_sockets.erase(a);
s->Close();
DELETE(s);
*/
void InspIRCd::DoBackgroundUserStuff(time_t TIME)
{
- CullList GlobalGoners;
+ 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++)
*/
if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != REG_ALL))
{
- log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick);
+ this->Log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick);
//ZapThisDns(curr->fd);
GlobalGoners.AddItem(curr,"Registration timeout");
continue;
}
if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr)))
{
- log(DEBUG,"dns done, registered=3, and modules ready, OK");
+ this->Log(DEBUG,"dns done, registered=3, and modules ready, OK");
curr->FullConnect(&GlobalGoners);
//ZapThisDns(curr->fd);
continue;
projects / user / henk / code / inspircd.git / blobdiff