Add m_chanhistory, mode +H <lines> to replay some lines of history on channel join

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 2a6bc4e0a2e80ecfe37477f1d57e4cffdaa87af8..c591097245aeeaa0a075c6d7f586c5552af6f752 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -111,22 +111,8 @@ void InspIRCd::Cleanup()
                Users->QuitUser(u, "Server shutdown");
        }
 
-       /* We do this more than once, so that any service providers get a
-        * chance to be unhooked by the modules using them, but then get
-        * a chance to be removed themsleves.
-        *
-        * XXX there may be a better way to do this
-        */
-       for (int tries = 0; tries < 4; tries++)
-       {
-               std::vector<std::string> module_names = Modules->GetAllModuleNames(0);
-               for (std::vector<std::string>::iterator k = module_names.begin(); k != module_names.end(); ++k)
-               {
-                       /* Unload all modules, so they get a chance to clean up their listeners */
-                       this->Modules->Unload(k->c_str());
-               }
-               GlobalCulls.Apply();
-       }
+       GlobalCulls.Apply();
+       Modules->UnloadAll();
 
        /* Delete objects dynamically allocated in constructor (destructor would be more appropriate, but we're likely exiting) */
        /* Must be deleted before modes as it decrements modelines */
@@ -273,12 +259,10 @@ bool InspIRCd::DaemonSeed()
                this->Logs->Log("STARTUP",DEFAULT,"Failed to getrlimit()!");
                return false;
        }
-       else
-       {
-               rl.rlim_cur = rl.rlim_max;
-               if (setrlimit(RLIMIT_CORE, &rl) == -1)
+       rl.rlim_cur = rl.rlim_max;
+
+       if (setrlimit(RLIMIT_CORE, &rl) == -1)
                        this->Logs->Log("STARTUP",DEFAULT,"setrlimit() failed, cannot increase coredump size.");
-       }
 
        return true;
 #endif
@@ -286,18 +270,9 @@ bool InspIRCd::DaemonSeed()
 
 void InspIRCd::WritePID(const std::string &filename)
 {
-       std::string fname = (filename.empty() ? "inspircd.pid" : filename);
-       std::replace(fname.begin(), fname.end(), '\\', '/');
-       if ((fname[0] != '/') && (!Config->StartsWithWindowsDriveLetter(filename)))
-       {
-               std::string::size_type pos;
-               std::string confpath = this->ConfigFileName;
-               if ((pos = confpath.rfind("/")) != std::string::npos)
-               {
-                       /* Leaves us with just the path */
-                       fname = confpath.substr(0, pos) + std::string("/") + fname;
-               }
-       }
+       std::string fname(filename);
+       if (fname.empty())
+               fname = "data/inspircd.pid";
        std::ofstream outfile(fname.c_str());
        if (outfile.is_open())
        {
@@ -320,13 +295,14 @@ InspIRCd::InspIRCd(int argc, char** argv) :
          * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods
          * themselves within the class.
          */
+        NICKForced("NICKForced", NULL),
+        OperQuit("OperQuit", NULL),
         IsChannel(&HandleIsChannel),
         IsSID(&HandleIsSID),
         Rehash(&HandleRehash),
         IsNick(&HandleIsNick),
         IsIdent(&HandleIsIdent),
         FloodQuitUser(&HandleFloodQuitUser)
-
 {
 #ifdef WIN32
        // Strict, frequent checking of memory on debug builds
@@ -338,8 +314,8 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
        ServerInstance = this;
 
-       Extensible::Register(&User::NICKForced);
-       Extensible::Register(&User::OperQuit);
+       Extensions.Register(&NICKForced);
+       Extensions.Register(&OperQuit);
 
        FailedPortList pl;
        int do_version = 0, do_nofork = 0, do_debug = 0,
@@ -400,15 +376,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        this->Config->argv = argv;
        this->Config->argc = argc;
 
-       if (chdir(Config->GetFullProgDir().c_str()))
-       {
-               printf("Unable to change to my directory: %s\nAborted.", strerror(errno));
-               exit(0);
-       }
-
-       this->Config->opertypes.clear();
-       this->Config->operclass.clear();
-
        this->TIME = this->OLDTIME = this->startup_time = time(NULL);
        srand(this->TIME);
 
@@ -478,7 +445,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        WSAStartup(MAKEWORD(2,0), &wsadata);
        ChangeWindowsSpecificPointers();
 #endif
-       Config->MyExecutable = argv[0];
 
        /* Set the finished argument values */
        Config->nofork = do_nofork;
@@ -567,15 +533,16 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        if (Config->sid.empty())
        {
                // Generate one
-               size_t sid = 0;
+               unsigned int sid = 0;
+               char sidstr[4];
 
                for (const char* x = Config->ServerName.c_str(); *x; ++x)
                        sid = 5 * sid + *x;
                for (const char* y = Config->ServerDesc.c_str(); *y; ++y)
                        sid = 5 * sid + *y;
-               sid = sid % 999;
+               sprintf(sidstr, "%03d", sid % 1000);
 
-               Config->sid = ConvToStr(sid);
+               Config->sid = sidstr;
        }
 
        /* set up fake client again this time with the correct uid */
@@ -807,7 +774,8 @@ int InspIRCd::Run()
                this->SE->DispatchEvents();
 
                /* if any users were quit, take them out */
-               this->GlobalCulls.Apply();
+               GlobalCulls.Apply();
+               AtomicActions.Run();
 
                if (this->s_signal)
                {