#include <sstream>
#include <vector>
#include <deque>
-#include <sched.h>
-#ifdef THREADED_DNS
-#include <pthread.h>
-#endif
#include "users.h"
#include "ctables.h"
#include "globals.h"
#include "commands.h"
#include "xline.h"
#include "inspstring.h"
-#include "dnsqueue.h"
#include "helperfuncs.h"
#include "hashcomp.h"
#include "socketengine.h"
extern socklen_t length;
extern std::vector<Module*> modules;
extern std::vector<ircd_module*> factory;
-extern std::vector<InspSocket*> module_sockets;
extern time_t TIME;
extern time_t OLDTIME;
-extern std::vector<userrec*> local_users;
-extern InspSocket* socket_ref[MAX_DESCRIPTORS];
-
-extern InspIRCd* ServerInstance;
-extern ServerConfig *Config;
-extern userrec* fd_ref_table[MAX_DESCRIPTORS];
char data[65536];
-extern user_hash clientlist;
-extern chan_hash chanlist;
-
-void ProcessUser(userrec* cu)
+void InspIRCd::ProcessUser(userrec* cu)
{
int result = EAGAIN;
log(DEBUG,"Processing user with fd %d",cu->fd);
- if (Config->GetIOHook(cu->port))
+ if (this->Config->GetIOHook(cu->GetPort()))
{
int result2 = 0;
int MOD_RESULT = 0;
try
{
- MOD_RESULT = Config->GetIOHook(cu->port)->OnRawSocketRead(cu->fd,data,65535,result2);
+ MOD_RESULT = this->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->fd,data,65535,result2);
log(DEBUG,"Data result returned by module: %d",MOD_RESULT);
}
catch (ModuleException& modexcept)
int currfd;
int floodlines = 0;
- ServerInstance->stats->statsRecv += result;
+ this->stats->statsRecv += result;
/*
* perform a check on the raw buffer as an array (not a string!) to remove
* character 0 which is illegal in the RFC - replace them with spaces.
if (!current->AddBuffer(data))
{
// AddBuffer returned false, theres too much data in the user's buffer and theyre up to no good.
- if (current->registered == 7)
+ if (current->registered == REG_ALL)
{
// Make sure they arn't flooding long lines.
if (TIME > current->reset_due)
{
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);
- kill_link(current,"Excess flood");
+ userrec::QuitUser(this, current,"Excess flood");
return;
}
else
{
- WriteServ(currfd, "NOTICE %s :Your previous line was too long and was not delivered (Over 512chars) Please shorten it.", current->nick);
+ current->WriteServ("NOTICE %s :Your previous line was too long and was not delivered (Over 512chars) Please shorten it.", current->nick);
current->recvq = "";
}
}
else
{
- WriteOpers("*** Excess flood from %s",(char*)inet_ntoa(current->ip4));
- log(DEFAULT,"Excess flood from: %s",(char*)inet_ntoa(current->ip4));
- add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4));
+ 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);
}
return;
}
- if (current->recvq.length() > (unsigned)Config->NetBufferSize)
+ if (current->recvq.length() > (unsigned)this->Config->NetBufferSize)
{
- if (current->registered == 7)
+ if (current->registered == REG_ALL)
{
- kill_link(current,"RecvQ exceeded");
+ userrec::QuitUser(this, current,"RecvQ exceeded");
}
else
{
- WriteOpers("*** Excess flood from %s",(char*)inet_ntoa(current->ip4));
- log(DEFAULT,"Excess flood from: %s",(char*)inet_ntoa(current->ip4));
- add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4));
+ 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);
}
{
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);
- kill_link(current,"Excess flood");
+ userrec::QuitUser(this, current,"Excess flood");
return;
}
if ((++floodlines > current->flood) && (current->flood != 0))
{
- if (current->registered == 7)
+ if (current->registered == REG_ALL)
{
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);
- kill_link(current,"Excess flood");
+ userrec::QuitUser(this, current,"Excess flood");
}
else
{
- add_zline(120,Config->ServerName,"Flood from unregistered connection",(char*)inet_ntoa(current->ip4));
+ add_zline(120,this->Config->ServerName,"Flood from unregistered connection",current->GetIPString());
apply_lines(APPLY_ZLINES);
}
if (single_line.length() > 512)
single_line.resize(512);
- userrec* old_comp = fd_ref_table[currfd];
+ userrec* old_comp = this->fd_ref_table[currfd];
- ServerInstance->Parser->ProcessBuffer(single_line,current);
+ this->Parser->ProcessBuffer(single_line,current);
/*
* look for the user's record in case it's changed... if theyve quit,
* we cant do anything more with their buffer, so bail.
* there used to be an ugly, slow loop here. Now we have a reference
* table, life is much easier (and FASTER)
*/
- userrec* new_comp = fd_ref_table[currfd];
- if ((currfd < 0) || (!fd_ref_table[currfd]) || (old_comp != new_comp))
+ userrec* new_comp = this->fd_ref_table[currfd];
+ if ((currfd < 0) || (!this->fd_ref_table[currfd]) || (old_comp != new_comp))
{
return;
}
if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
{
log(DEBUG,"killing: %s",cu->nick);
- kill_link(cu,strerror(errno));
+ userrec::QuitUser(this,cu,strerror(errno));
return;
}
}
else if (result == 0)
{
log(DEBUG,"InspIRCd: Exited: %s",cu->nick);
- kill_link(cu,"Client exited");
+ userrec::QuitUser(this,cu,"Client exited");
log(DEBUG,"Bailing from client exit");
return;
}
}
-void DoSocketTimeouts(time_t TIME)
+void InspIRCd::DoSocketTimeouts(time_t TIME)
{
- unsigned int numsockets = module_sockets.size();
- SocketEngine* SE = ServerInstance->SE;
+ unsigned int numsockets = this->module_sockets.size();
+ SocketEngine* SE = this->SE;
- for (std::vector<InspSocket*>::iterator a = module_sockets.begin(); a < module_sockets.end(); a++)
+ 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) && (socket_ref[s->GetFd()] != NULL) && (s->Timeout(TIME)))
+ if ((s) && (s->GetFd() >= 0) && (s->GetFd() < MAX_DESCRIPTORS) && (this->socket_ref[s->GetFd()] != NULL) && (s->Timeout(TIME)))
{
log(DEBUG,"userprocess.cpp: Socket poll returned false, close and bail");
- socket_ref[s->GetFd()] = NULL;
+ this->socket_ref[s->GetFd()] = NULL;
SE->DelFd(s->GetFd());
- module_sockets.erase(a);
+ this->module_sockets.erase(a);
s->Close();
DELETE(s);
break;
}
- if (module_sockets.size() != numsockets)
+ if (this->module_sockets.size() != numsockets)
break;
}
}
* stuff like ping checks, registration timeouts, etc. This function is
* also responsible for checking if InspSocket derived classes are timed out.
*/
-void DoBackgroundUserStuff(time_t TIME)
+void InspIRCd::DoBackgroundUserStuff(time_t TIME)
{
CullList GlobalGoners;
- int cfd = 0;
-
/* XXX: IT IS NOT SAFE TO USE AN ITERATOR HERE. DON'T EVEN THINK ABOUT IT. */
- for (unsigned long count2 = 0; count2 != local_users.size(); count2++)
+ for (unsigned long count2 = 0; count2 != this->local_users.size(); count2++)
{
- if (count2 >= local_users.size())
+ if (count2 >= this->local_users.size())
break;
- userrec* curr = local_users[count2];
+ userrec* curr = this->local_users[count2];
if (curr)
{
- cfd = curr->fd;
-
/*
* registration timeout -- didnt send USER/NICK/HOST
* in the time specified in their connection class.
*/
- if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != 7))
+ if (((unsigned)TIME > (unsigned)curr->timeout) && (curr->registered != REG_ALL))
{
log(DEBUG,"InspIRCd: registration timeout: %s",curr->nick);
- ZapThisDns(curr->fd);
+ //ZapThisDns(curr->fd);
GlobalGoners.AddItem(curr,"Registration timeout");
continue;
}
-
/*
* 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.
*/
- if ((TIME > curr->signon) && (curr->registered == 3) && (AllModulesReportReady(curr)))
+ if ((TIME > curr->signon) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr)))
{
curr->dns_done = true;
- ZapThisDns(curr->fd);
- ServerInstance->stats->statsDnsBad++;
- FullConnectUser(curr,&GlobalGoners);
+ //ZapThisDns(curr->fd);
+ this->stats->statsDnsBad++;
+ curr->FullConnect(&GlobalGoners);
continue;
}
-
- if ((curr->dns_done) && (curr->registered == 3) && (AllModulesReportReady(curr)))
+ if ((curr->dns_done) && (curr->registered == REG_NICKUSER) && (AllModulesReportReady(curr)))
{
log(DEBUG,"dns done, registered=3, and modules ready, OK");
- FullConnectUser(curr,&GlobalGoners);
- ZapThisDns(curr->fd);
+ curr->FullConnect(&GlobalGoners);
+ //ZapThisDns(curr->fd);
continue;
}
-
// It's time to PING this user. Send them a ping.
- if ((TIME > curr->nping) && (curr->registered == 7))
+ if ((TIME > curr->nping) && (curr->registered == REG_ALL))
{
// This user didn't answer the last ping, remove them
if (!curr->lastping)
{
GlobalGoners.AddItem(curr,"Ping timeout");
+ curr->lastping = 1;
+ curr->nping = TIME+curr->pingmax;
continue;
}
-
- Write(curr->fd,"PING :%s",Config->ServerName);
+ curr->Write("PING :%s",this->Config->ServerName);
curr->lastping = 0;
curr->nping = TIME+curr->pingmax;
}
* We can flush the write buffer as the last thing we do, because if they
* match any of the above conditions its no use flushing their buffer anyway.
*/
- if ((cfd > 0) && (cfd < MAX_DESCRIPTORS) && (fd_ref_table[cfd] == curr) && (curr))
+
+ curr->FlushWriteBuf();
+ if (*curr->GetWriteError())
{
- curr->FlushWriteBuf();
- if (*curr->GetWriteError())
- {
- GlobalGoners.AddItem(curr,curr->GetWriteError());
- continue;
- }
+ GlobalGoners.AddItem(curr,curr->GetWriteError());
+ continue;
}
}
+
}
+
/* Remove all the queued users who are due to be quit, free memory used. */
GlobalGoners.Apply();
}
projects / user / henk / code / inspircd.git / blobdiff