extern time_t TIME -> InspIRCd::Time()

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

diff --git a/src/userprocess.cpp b/src/userprocess.cpp
index 42c3bd3db49aff8bd84fc971eb4a9a19e978b42c..ccd32a9c973f2e987e45065c15877f55c4baaef3 100644 (file)
--- a/src/userprocess.cpp
+++ b/src/userprocess.cpp
@@ -19,7 +19,6 @@
 using namespace std;
 
 #include "inspircd_config.h"
-#include "inspircd.h"
 #include "configreader.h"
 #include <unistd.h>
 #include <fcntl.h>
@@ -39,7 +38,6 @@ using namespace std;
 #include "modules.h"
 #include "dynamic.h"
 #include "wildcard.h"
-#include "message.h"
 #include "mode.h"
 #include "commands.h"
 #include "xline.h"
@@ -48,16 +46,14 @@ using namespace std;
 #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)
@@ -146,7 +142,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);
-                                               WriteOpers("*** 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;
                                        }
@@ -158,7 +154,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                }
                                else
                                {
-                                       WriteOpers("*** Excess flood from %s",current->GetIPString());
+                                       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);
@@ -175,7 +171,7 @@ void InspIRCd::ProcessUser(userrec* cu)
                                }
                                else
                                {
-                                       WriteOpers("*** Excess flood from %s",current->GetIPString());
+                                       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);
@@ -303,7 +299,7 @@ void InspIRCd::DoSocketTimeouts(time_t TIME)
  */
 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++)