Fix --with-max-clients not taking a parameter (reported by erich)

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 29b2105ce788f0c570399c237cba9d51b21291e9..d5146e900edd7e1af648820a57dfa4298fa9731b 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -25,6 +25,7 @@
 #include "socket.h"
 #include "typedefs.h"
 #include "command_parse.h"
+#include "exitcodes.h"
 #include <dlfcn.h>
 
 using irc::sockets::NonBlocking;
@@ -65,10 +66,9 @@ void InspIRCd::Exit(int status)
 {
        if (SI)
        {
-               SI->SendError("Exiting with status " + ConvToStr(status));
+               SI->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
                SI->Cleanup();
        }
-
        exit (status);
 }
 
@@ -136,12 +136,45 @@ void InspIRCd::Start()
 void InspIRCd::Rehash(int status)
 {
        SI->WriteOpers("Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(CONFIG_FILE));
-       fclose(SI->Config->log_file);
+       SI->CloseLog();
        SI->OpenLog(NULL,0);
+       SI->RehashUsersAndChans();
+       FOREACH_MOD_I(SI, I_OnGarbageCollect, OnGarbageCollect());
        SI->Config->Read(false,NULL);
        FOREACH_MOD_I(SI,I_OnRehash,OnRehash(""));
 }
 
+/** Because hash_map doesnt free its buckets when we delete items (this is a 'feature')
+ * we must occasionally rehash the hash (yes really).
+ * We do this by copying the entries from the old hash to a new hash, causing all
+ * empty buckets to be weeded out of the hash. We dont do this on a timer, as its
+ * very expensive, so instead we do it when the user types /REHASH and expects a
+ * short delay anyway.
+ */
+void InspIRCd::RehashUsersAndChans()
+{
+       user_hash* old_users = this->clientlist;
+       chan_hash* old_chans = this->chanlist;
+
+       this->clientlist = new user_hash();
+       this->chanlist = new chan_hash();
+
+       for (user_hash::const_iterator n = old_users->begin(); n != old_users->end(); n++)
+               this->clientlist->insert(*n);
+
+       delete old_users;
+
+       for (chan_hash::const_iterator n = old_chans->begin(); n != old_chans->end(); n++)
+               this->chanlist->insert(*n);
+
+       delete old_chans;
+}
+
+void InspIRCd::CloseLog()
+{
+       this->Logger->Close();
+}
+
 void InspIRCd::SetSignals()
 {
        signal(SIGALRM, SIG_IGN);
@@ -167,7 +200,7 @@ bool InspIRCd::DaemonSeed()
                 */
                while (kill(childpid, 0) != -1)
                        sleep(1);
-               exit(ERROR);
+               exit(0);
        }
        setsid ();
        umask (007);
@@ -212,7 +245,7 @@ void InspIRCd::WritePID(const std::string &filename)
        {
                printf("Failed to write PID-file '%s', exiting.\n",fname.c_str());
                this->Log(DEFAULT,"Failed to write PID-file '%s', exiting.",fname.c_str());
-               Exit(0);
+               Exit(EXIT_STATUS_PID);
        }
 }
 
@@ -229,8 +262,15 @@ InspIRCd::InspIRCd(int argc, char** argv)
 
        modules.resize(255);
        factory.resize(255);
-       
+
+       this->clientlist = new user_hash();
+       this->chanlist = new chan_hash();
+
        this->Config = new ServerConfig(this);
+
+       this->Config->argv = argv;
+       this->Config->argc = argc;
+
        this->Config->opertypes.clear();
        this->Config->operclass.clear();
        this->SNO = new SnomaskManager(this);
@@ -245,7 +285,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                printf("ERROR: Cannot open config file: %s\nExiting...\n",CONFIG_FILE);
                this->Log(DEFAULT,"main: no config");
                printf("ERROR: Your config file is missing, this IRCd will self destruct in 10 seconds!\n");
-               Exit(ERROR);
+               Exit(EXIT_STATUS_CONFIG);
        }
        *this->LogFileName = 0;
        if (argc > 1) {
@@ -277,14 +317,14 @@ InspIRCd::InspIRCd(int argc, char** argv)
                                else
                                {
                                        printf("ERROR: The -logfile parameter must be followed by a log file name and path.\n");
-                                       Exit(ERROR);
+                                       Exit(EXIT_STATUS_CONFIG);
                                }
                                i++;
                        }
                        else
                        {
                                printf("Usage: %s [-nofork] [-nolog] [-debug] [-wait] [-logfile <filename>]\n",argv[0]);
-                               Exit(ERROR);
+                               Exit(EXIT_STATUS_ARGV);
                        }
                }
        }
@@ -317,7 +357,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                if (!this->DaemonSeed())
                {
                        printf("ERROR: could not go into daemon mode. Shutting down.\n");
-                       Exit(ERROR);
+                       Exit(EXIT_STATUS_FORK);
                }
        }
 
@@ -337,7 +377,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        if ((stats->BoundPortCount == 0) && (found_ports > 0))
        {
                printf("\nERROR: I couldn't bind any ports! Are you sure you didn't start InspIRCd twice?\n");
-               Exit(ERROR);
+               Exit(EXIT_STATUS_BIND);
        }
        
        if (stats->BoundPortCount != (unsigned int)found_ports)
@@ -361,7 +401,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                if (!SE->AddFd(Config->openSockfd[count]))
                {
                        printf("\nEH? Could not add listener to socketengine. You screwed up, aborting.\n");
-                       Exit(ERROR);
+                       Exit(EXIT_STATUS_INTERNAL);
                }
        }
 
@@ -560,11 +600,11 @@ bool InspIRCd::UnloadModule(const char* filename)
                                return false;
                        }
                        /* Give the module a chance to tidy out all its metadata */
-                       for (chan_hash::iterator c = this->chanlist.begin(); c != this->chanlist.end(); c++)
+                       for (chan_hash::iterator c = this->chanlist->begin(); c != this->chanlist->end(); c++)
                        {
                                modules[j]->OnCleanup(TYPE_CHANNEL,c->second);
                        }
-                       for (user_hash::iterator u = this->clientlist.begin(); u != this->clientlist.end(); u++)
+                       for (user_hash::iterator u = this->clientlist->begin(); u != this->clientlist->end(); u++)
                        {
                                modules[j]->OnCleanup(TYPE_USER,u->second);
                        }
@@ -775,6 +815,8 @@ void InspIRCd::DoOneIteration(bool process_module_sockets)
                if ((TIME % 3600) == 0)
                {
                        irc::whowas::MaintainWhoWas(this, TIME);
+                       this->RehashUsersAndChans();
+                       FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
                }
                Timers->TickTimers(TIME);
                this->DoBackgroundUserStuff(TIME);
@@ -920,7 +962,8 @@ bool FileLogger::Readable()
 void FileLogger::HandleEvent(EventType et, int errornum)
 {
        this->WriteLogLine("");
-       ServerInstance->SE->DelFd(this);
+       if (log)
+               ServerInstance->SE->DelFd(this);
 }
 
 void FileLogger::WriteLogLine(const std::string &line)
@@ -961,18 +1004,24 @@ void FileLogger::Close()
                fcntl(fileno(log), F_SETFL, flags ^ O_NONBLOCK);
                if (buffer.size())
                        fprintf(log,"%s",buffer.c_str());
+
+               ServerInstance->SE->DelFd(this);
+
                fflush(log);
                fclose(log);
        }
+
        buffer = "";
-       ServerInstance->SE->DelFd(this);
 }
 
 FileLogger::FileLogger(InspIRCd* Instance, FILE* logfile) : ServerInstance(Instance), log(logfile), writeops(0)
 {
-       irc::sockets::NonBlocking(fileno(log));
-       this->SetFd(fileno(log));
-       buffer = "";
+       if (log)
+       {
+               irc::sockets::NonBlocking(fileno(log));
+               this->SetFd(fileno(log));
+               buffer = "";
+       }
 }
 
 FileLogger::~FileLogger()