m_spanningtree Remove duplicate code for sending channel messages from RouteCommand()

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 97d95f9bd3820b23c68bc1e2a7fffc27bda9ff60..c94f0884222aaf7b7b9e764ef4dcedc50e614023 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -26,7 +26,6 @@
  */
 
 
-/* $Core */
 #include "inspircd.h"
 #include <signal.h>
 
@@ -99,9 +98,9 @@ template<typename T> static void DeleteZero(T*&n)
 
 void InspIRCd::Cleanup()
 {
+       // Close all listening sockets
        for (unsigned int i = 0; i < ports.size(); i++)
        {
-               /* This calls the constructor and closes the listening socket */
                ports[i]->cull();
                delete ports[i];
        }
@@ -137,40 +136,10 @@ void InspIRCd::Cleanup()
        DeleteZero(this->Threads);
        DeleteZero(this->Timers);
        DeleteZero(this->SE);
-       /* Close logging */
-       this->Logs->CloseLogs();
+       Logs->CloseLogs();
        DeleteZero(this->Logs);
 }
 
-void InspIRCd::Restart(const std::string &reason)
-{
-       /* SendError flushes each client's queue,
-        * regardless of writeability state
-        */
-       this->SendError(reason);
-
-       /* Figure out our filename (if theyve renamed it, we're boned) */
-       std::string me;
-
-       char** argv = Config->cmdline.argv;
-
-#ifdef _WIN32
-       char module[MAX_PATH];
-       if (GetModuleFileNameA(NULL, module, MAX_PATH))
-               me = module;
-#else
-       me = argv[0];
-#endif
-
-       this->Cleanup();
-
-       if (execv(me.c_str(), argv) == -1)
-       {
-               /* Will raise a SIGABRT if not trapped */
-               throw CoreException(std::string("Failed to execv()! error: ") + strerror(errno));
-       }
-}
-
 void InspIRCd::SetSignals()
 {
 #ifndef _WIN32
@@ -197,8 +166,8 @@ bool InspIRCd::DaemonSeed()
 #else
        signal(SIGTERM, InspIRCd::QuickExit);
 
-       int childpid;
-       if ((childpid = fork ()) < 0)
+       int childpid = fork();
+       if (childpid < 0)
                return false;
        else if (childpid > 0)
        {
@@ -238,7 +207,7 @@ void InspIRCd::WritePID(const std::string &filename)
 #ifndef _WIN32
        std::string fname(filename);
        if (fname.empty())
-               fname = DATA_PATH "/inspircd.pid";
+               fname = ServerInstance->Config->Paths.PrependData("inspircd.pid");
        std::ofstream outfile(fname.c_str());
        if (outfile.is_open())
        {
@@ -262,7 +231,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
          * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods
          * themselves within the class.
          */
-        OperQuit("OperQuit", NULL),
+        OperQuit("operquit", NULL),
         GenRandom(&HandleGenRandom),
         IsChannel(&HandleIsChannel),
         Rehash(&HandleRehash),
@@ -277,7 +246,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        FailedPortList pl;
        int do_version = 0, do_nofork = 0, do_debug = 0,
            do_nolog = 0, do_root = 0, do_testsuite = 0;    /* flag variables */
-       int c = 0;
 
        // Initialize so that if we exit before proper initialization they're not deleted
        this->Logs = 0;
@@ -360,6 +328,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
                { 0, 0, 0, 0 }
        };
 
+       int c;
        int index;
        while ((c = getopt_long(argc, argv, ":c:", longopts, &index)) != -1)
        {
@@ -389,7 +358,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
        if (do_version)
        {
-               std::cout << std::endl << VERSION << " r" << REVISION << std::endl;
+               std::cout << std::endl << VERSION << " " << REVISION << std::endl;
                Exit(EXIT_STATUS_NOERROR);
        }
 
@@ -473,8 +442,8 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
        SE->RecoverFromFork();
 
-       /* During startup we don't actually initialize this
-        * in the thread engine.
+       /* During startup we read the configuration now, not in
+        * a seperate thread
         */
        this->Config->Read();
        this->Config->Apply(NULL, "");
@@ -488,11 +457,10 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        // Initialize the UID generator with our sid
        this->UIDGen.init(Config->sid);
 
-       /* set up fake client again this time with the correct uid */
+       // Create the server user for this server
        this->FakeClient = new FakeUser(Config->sid, Config->ServerName);
 
-       // Get XLine to do it's thing.
-       this->XLines->CheckELines();
+       // This is needed as all new XLines are marked pending until ApplyLines() is called
        this->XLines->ApplyLines();
 
        int bounditems = BindPorts(pl);
@@ -501,7 +469,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
        this->Modules->LoadAll();
 
-       /* Just in case no modules were loaded - fix for bug #101 */
+       // Build ISupport as ModuleManager::LoadAll() does not do it
        this->ISupport.Build();
        Config->ApplyDisabledCommands(Config->DisabledCommands);
 
@@ -588,7 +556,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
                if (ret == -1)
                {
-                       this->Logs->Log("SETGROUPS", LOG_DEFAULT, "setgroups() failed (wtf?): %s", strerror(errno));
+                       this->Logs->Log("STARTUP", LOG_DEFAULT, "setgroups() failed (wtf?): %s", strerror(errno));
                        this->QuickExit(0);
                }
 
@@ -600,7 +568,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
                if (!g)
                {
-                       this->Logs->Log("SETGUID", LOG_DEFAULT, "getgrnam() failed (bad user?): %s", strerror(errno));
+                       this->Logs->Log("STARTUP", LOG_DEFAULT, "getgrnam() failed (bad user?): %s", strerror(errno));
                        this->QuickExit(0);
                }
 
@@ -608,7 +576,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
                if (ret == -1)
                {
-                       this->Logs->Log("SETGUID", LOG_DEFAULT, "setgid() failed (bad user?): %s", strerror(errno));
+                       this->Logs->Log("STARTUP", LOG_DEFAULT, "setgid() failed (bad user?): %s", strerror(errno));
                        this->QuickExit(0);
                }
        }
@@ -623,7 +591,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
                if (!u)
                {
-                       this->Logs->Log("SETGUID", LOG_DEFAULT, "getpwnam() failed (bad user?): %s", strerror(errno));
+                       this->Logs->Log("STARTUP", LOG_DEFAULT, "getpwnam() failed (bad user?): %s", strerror(errno));
                        this->QuickExit(0);
                }
 
@@ -631,7 +599,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
                if (ret == -1)
                {
-                       this->Logs->Log("SETGUID", LOG_DEFAULT, "setuid() failed (bad user?): %s", strerror(errno));
+                       this->Logs->Log("STARTUP", LOG_DEFAULT, "setuid() failed (bad user?): %s", strerror(errno));
                        this->QuickExit(0);
                }
        }
@@ -660,14 +628,14 @@ void InspIRCd::UpdateTime()
 #endif
 }
 
-int InspIRCd::Run()
+void InspIRCd::Run()
 {
        /* See if we're supposed to be running the test suite rather than entering the mainloop */
        if (Config->cmdline.TestSuite)
        {
                TestSuite* ts = new TestSuite;
                delete ts;
-               Exit(0);
+               return;
        }
 
        UpdateTime();
@@ -733,7 +701,7 @@ int InspIRCd::Run()
                        if ((TIME.tv_sec % 3600) == 0)
                        {
                                Users->GarbageCollect();
-                               FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect());
+                               FOREACH_MOD(OnGarbageCollect, ());
                        }
 
                        Timers->TickTimers(TIME.tv_sec);
@@ -741,7 +709,7 @@ int InspIRCd::Run()
 
                        if ((TIME.tv_sec % 5) == 0)
                        {
-                               FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME.tv_sec));
+                               FOREACH_MOD(OnBackgroundTimer, (TIME.tv_sec));
                                SNO->FlushSnotices();
                        }
                }
@@ -766,8 +734,6 @@ int InspIRCd::Run()
                        s_signal = 0;
                }
        }
-
-       return 0;
 }
 
 sig_atomic_t InspIRCd::s_signal = 0;