Auto loading of commands as shared objects via dlsym (very lightweight interface...

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 5cf116978ec4822403e87f99cb9975e8a4d654ba..aaaf137105223923b1d536755162b7fa03f9fd0f 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -18,36 +18,14 @@
 
 using namespace std;
 
-#include "inspircd_config.h"
 #include "configreader.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/errno.h>
-#include <sys/ioctl.h>
-#include <sys/utsname.h>
-#include <time.h>
-#include <string>
-#include <ext/hash_map>
-#include <map>
-#include <sstream>
-#include <vector>
-#include <deque>
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
 #include "wildcard.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"
 
@@ -55,11 +33,9 @@ void InspIRCd::ProcessUser(userrec* cu)
 {
        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;
@@ -67,7 +43,7 @@ void InspIRCd::ProcessUser(userrec* cu)
 
                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)
@@ -115,7 +91,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)
@@ -137,7 +113,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                        if (current->lines_in > current->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);
+                                               this->SNO->WriteToSnoMask('f',"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
                                                userrec::QuitUser(this, current,"Excess flood");
                                                return;
                                        }
@@ -150,7 +126,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                else
                                {
                                        this->WriteOpers("*** Excess flood from %s",current->GetIPString());
-                                       this->Log(DEFAULT,"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);
                                }
@@ -167,7 +143,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                else
                                {
                                        this->WriteOpers("*** Excess flood from %s",current->GetIPString());
-                                       this->Log(DEFAULT,"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);
                                }
@@ -187,7 +163,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                if (++current->lines_in > current->flood)
                                {
                                        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);
+                                       this->SNO->WriteToSnoMask('f',"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
                                        userrec::QuitUser(this, current,"Excess flood");
                                        return;
                                }
@@ -197,7 +173,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                        if (current->registered == REG_ALL)
                                        {
                                                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);
+                                               SNO->WriteToSnoMask('f',"Excess flood from: %s!%s@%s",current->nick,current->ident,current->host);
                                                userrec::QuitUser(this, current,"Excess flood");
                                        }
                                        else
@@ -216,7 +192,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 +201,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;
                                }
@@ -262,30 +238,6 @@ 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)))
-               {
-                       this->Log(DEBUG,"userprocess.cpp: Socket poll returned false, close and bail");
-                       this->socket_ref[s->GetFd()] = NULL;
-                       SE->DelFd(s->GetFd());
-                       this->module_sockets.erase(a);
-                       s->Close();
-                       DELETE(s);
-                       break;
-               }
-
-               if (this->module_sockets.size() != numsockets)
-                       break;
-       }
-}
-
 /**
  * This function is called once a second from the mainloop.
  * It is intended to do background checking on all the user structs, e.g.
@@ -371,3 +323,4 @@ void InspIRCd::DoBackgroundUserStuff(time_t TIME)
        /* Remove all the queued users who are due to be quit, free memory used. */
        GlobalGoners.Apply();
 }
+