Add factories for other types

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 34d15e4e396102633b4e1737702aac4cf2597647..2f00b9f2e7cb3e5278a1a3c955ed57d9a9ab26d7 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -11,6 +11,8 @@
  * ---------------------------------------------------
  */
 
+/* $Install: src/inspircd $(BINPATH) */
+
 #include "inspircd.h"
 #include <signal.h>
 
@@ -82,7 +84,7 @@ void InspIRCd::Cleanup()
        }
 
        /* Close all client sockets, or the new process inherits them */
-       for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+       for (std::vector<User*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
        {
                (*i)->SetWriteError("Server shutdown");
                (*i)->CloseSocket();
@@ -106,15 +108,19 @@ void InspIRCd::Cleanup()
                        for (int k = 0; k <= MyModCount; k++)
                                this->Modules->Unload(mymodnames[k].c_str());
                }
+
        }
 
        /* Close logging */
        if (this->Logger)
                this->Logger->Close();
 
+
        /* Cleanup Server Names */
        for(servernamelist::iterator itr = servernames.begin(); itr != servernames.end(); ++itr)
                delete (*itr);
+
+
 }
 
 void InspIRCd::Restart(const std::string &reason)
@@ -318,7 +324,14 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->uuidlist = new user_hash();
        this->chanlist = new chan_hash();
 
+
        this->Config = new ServerConfig(this);
+       this->SNO = new SnomaskManager(this);
+       this->Modules = new ModuleManager(this);
+       this->stats = new serverstats();
+       this->Timers = new TimerManager(this);
+       this->Parser = new CommandParser(this);
+       this->XLines = new XLineManager(this);
 
        this->Config->argv = argv;
        this->Config->argc = argc;
@@ -331,10 +344,9 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        this->Config->opertypes.clear();
        this->Config->operclass.clear();
-       this->SNO = new SnomaskManager(this);
+
        this->TIME = this->OLDTIME = this->startup_time = time(NULL);
        this->time_delta = 0;
-       this->next_call = this->TIME + 3;
        srand(this->TIME);
 
        *this->LogFileName = 0;
@@ -388,7 +400,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        {
                DWORD ExitCode = WindowsForkStart(this);
                if(ExitCode)
-                       Exit(ExitCode);
+                       exit(ExitCode);
        }
 
        // Set up winsock
@@ -420,16 +432,13 @@ InspIRCd::InspIRCd(int argc, char** argv)
        /* Set the finished argument values */
        Config->nofork = do_nofork;
        Config->forcedebug = do_debug;
-       Config->writelog = !do_nolog;
-
-       this->Modules = new ModuleManager(this);
-       this->stats = new serverstats();
-       this->Timers = new TimerManager(this);
-       this->Parser = new CommandParser(this);
-       this->XLines = new XLineManager(this);
-       
+       Config->writelog = !do_nolog;   
        Config->ClearStack();
        Config->Read(true, NULL);
+
+       // Get XLine to do it's thing.
+       this->XLines->CheckELines(this->XLines->lookup_lines['E']);
+       this->XLines->ApplyLines();
        
        this->Modules->modules.resize(255);
        this->Modules->handles.resize(255);
@@ -459,7 +468,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->InitialiseUID();
 
        /* set up fake client */
-       this->FakeClient = new userrec(this);
+       this->FakeClient = new User(this);
        this->FakeClient->SetFd(FD_MAGIC_NUMBER);
 
        if (!do_root)
@@ -611,14 +620,18 @@ int InspIRCd::Run()
                if (TIME != OLDTIME)
                {
                        if (TIME < OLDTIME)
+                       {
                                WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
+                       }
+
                        if ((TIME % 3600) == 0)
                        {
                                this->RehashUsersAndChans();
                                FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
                        }
+
                        Timers->TickTimers(TIME);
-                       this->DoBackgroundUserStuff(TIME);
+                       this->DoBackgroundUserStuff();
 
                        if ((TIME % 5) == 0)
                        {
@@ -660,7 +673,7 @@ int InspIRCd::Run()
                this->GlobalCulls.Apply();
 
                /* If any inspsockets closed, remove them */
-               this->InspSocketCull();
+               this->BufferedSocketCull();
 
                if (this->s_signal)
                {
@@ -672,9 +685,9 @@ int InspIRCd::Run()
        return 0;
 }
 
-void InspIRCd::InspSocketCull()
+void InspIRCd::BufferedSocketCull()
 {
-       for (std::map<InspSocket*,InspSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
+       for (std::map<BufferedSocket*,BufferedSocket*>::iterator x = SocketCull.begin(); x != SocketCull.end(); ++x)
        {
                SE->DelFd(x->second);
                x->second->Close();
@@ -686,10 +699,10 @@ void InspIRCd::InspSocketCull()
 /**********************************************************************************/
 
 /**
- * An ircd in four lines! bwahahaha. ahahahahaha. ahahah *cough*.
+ * An ircd in five lines! bwahahaha. ahahahahaha. ahahah *cough*.
  */
 
-int ircd(int argc, char ** argv)
+int main(int argc, char ** argv)
 {
        SI = new InspIRCd(argc, argv);
        mysig = &SI->s_signal;
@@ -698,26 +711,11 @@ int ircd(int argc, char ** argv)
        return 0;
 }
 
-#ifdef WINDOWS
-
-int main(int argc, char ** argv)
-{
-       ircd(argc,argv);
-       return 0;
-}
-
-#else
-int main(int argc, char** argv)
-{
-       return ircd(argc,argv);
-}
-#endif
-
 /* this returns true when all modules are satisfied that the user should be allowed onto the irc server
  * (until this returns true, a user will block in the waiting state, waiting to connect up to the
  * registration timeout maximum seconds)
  */
-bool InspIRCd::AllModulesReportReady(userrec* user)
+bool InspIRCd::AllModulesReportReady(User* user)
 {
        if (!Config->global_implementation[I_OnCheckReady])
                return true;
@@ -749,7 +747,7 @@ int InspIRCd::SetTimeDelta(int delta)
        return old;
 }
 
-void InspIRCd::AddLocalClone(userrec* user)
+void InspIRCd::AddLocalClone(User* user)
 {
        clonemap::iterator x = local_clones.find(user->GetIPString());
        if (x != local_clones.end())
@@ -758,7 +756,7 @@ void InspIRCd::AddLocalClone(userrec* user)
                local_clones[user->GetIPString()] = 1;
 }
 
-void InspIRCd::AddGlobalClone(userrec* user)
+void InspIRCd::AddGlobalClone(User* user)
 {
        clonemap::iterator y = global_clones.find(user->GetIPString());
        if (y != global_clones.end())