Spotted problem: must clear out all prefixes attached to a user when they quit or...

[user/henk/code/inspircd.git] / src / userprocess.cpp

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 565b7df050690a01de94ec64e51b4537710d6668..aa16bd90ee4f6e500a532f6cf67d3a399358036b 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -42,7 +42,7 @@ using namespace std;
 #include "commands.h"
 #include "xline.h"
 #include "inspstring.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "socketengine.h"
 #include "userprocess.h"
@@ -55,11 +55,9 @@ 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;
@@ -67,12 +65,12 @@ void InspIRCd::ProcessUser(userrec* cu)
 
                try
                {
-                       MOD_RESULT = this->Config->GetIOHook(cu->GetPort())->OnRawSocketRead(cu->fd,ReadBuffer,sizeof(ReadBuffer),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)
@@ -89,7 +87,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                result = cu->ReadData(ReadBuffer, sizeof(ReadBuffer));
        }
 
-       log(DEBUG,"Read result: %d",result);
+       this->Log(DEBUG,"Read result: %d",result);
 
        if ((result) && (result != -EAGAIN))
        {
@@ -115,7 +113,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                        ReadBuffer[result] = '\0';
 
                current = cu;
-               currfd = current->fd;
+               currfd = current->GetFd();
 
                // add the data to the users buffer
                if (result > 0)
@@ -136,7 +134,7 @@ void InspIRCd::ProcessUser(userrec* cu)
 
                                        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);
                                                this->WriteOpers("*** Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
                                                userrec::QuitUser(this, current,"Excess flood");
                                                return;
@@ -150,9 +148,9 @@ void InspIRCd::ProcessUser(userrec* cu)
                                else
                                {
                                        this->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->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;
@@ -167,9 +165,9 @@ void InspIRCd::ProcessUser(userrec* cu)
                                else
                                {
                                        this->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->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;
@@ -186,7 +184,7 @@ void InspIRCd::ProcessUser(userrec* cu)
 
                                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(this, current,"Excess flood");
                                        return;
@@ -196,14 +194,14 @@ void InspIRCd::ProcessUser(userrec* cu)
                                {
                                        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(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;
@@ -216,7 +214,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                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);
                                /*
@@ -225,8 +223,8 @@ void InspIRCd::ProcessUser(userrec* cu)
                                 * 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;
                                }
@@ -242,7 +240,7 @@ void InspIRCd::ProcessUser(userrec* cu)
 
                if ((result == -1) && (errno != EAGAIN) && (errno != EINTR))
                {
-                       log(DEBUG,"killing: %s",cu->nick);
+                       this->Log(DEBUG,"killing: %s",cu->nick);
                        userrec::QuitUser(this,cu,strerror(errno));
                        return;
                }
@@ -255,9 +253,9 @@ void InspIRCd::ProcessUser(userrec* cu)
        }
        else if (result == 0)
        {
-               log(DEBUG,"InspIRCd: Exited: %s",cu->nick);
+               this->Log(DEBUG,"InspIRCd: Exited: %s",cu->nick);
                userrec::QuitUser(this,cu,"Client exited");
-               log(DEBUG,"Bailing from client exit");
+               this->Log(DEBUG,"Bailing from client exit");
                return;
        }
 }
@@ -265,16 +263,15 @@ void InspIRCd::ProcessUser(userrec* cu)
 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);
@@ -312,7 +309,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                         */
                        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;
@@ -331,7 +328,7 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
                        }
                        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;