#include "commands.h"
#include "xline.h"
#include "inspstring.h"
-#include "helperfuncs.h"
+
#include "hashcomp.h"
#include "socketengine.h"
#include "userprocess.h"
{
int result = EAGAIN;
- if (cu->fd == FD_MAGIC_NUMBER)
+ if (cu->GetFd() == FD_MAGIC_NUMBER)
return;
- this->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,ReadBuffer,sizeof(ReadBuffer),result2);
+ 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)
ReadBuffer[result] = '\0';
current = cu;
- currfd = current->fd;
+ currfd = current->GetFd();
// add the data to the users buffer
if (result > 0)
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;
}
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)))
{
this->Log(DEBUG,"userprocess.cpp: Socket poll returned false, close and bail");
- this->socket_ref[s->GetFd()] = NULL;
- SE->DelFd(s->GetFd());
+ SE->DelFd(s);
this->module_sockets.erase(a);
s->Close();
DELETE(s);