Change message to indicate that the count only includes client ports

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 91681235794c6e3088957dea50a76d0d3d951b3f..e7e6c9aadb0317ca5c55b1c387e02c3e3a4d283c 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -182,6 +182,8 @@ std::string InspIRCd::GetRevision()
 InspIRCd::InspIRCd(int argc, char** argv)
        : ModCount(-1), duration_m(60), duration_h(60*60), duration_d(60*60*24), duration_w(60*60*24*7), duration_y(60*60*24*365)
 {
+       int found_ports = 0;
+
        modules.resize(255);
        factory.resize(255);
        
@@ -191,6 +193,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->SNO = new SnomaskManager(this);
        this->Start();
        this->TIME = this->OLDTIME = this->startup_time = time(NULL);
+       this->time_delta = 0;
        this->next_call = this->TIME + 3;
        srand(this->TIME);
        this->Log(DEBUG,"*** InspIRCd starting up!");
@@ -257,7 +260,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
        this->AddServerName(Config->ServerName);        
        CheckDie();
        InitializeDisabledCommands(Config->DisabledCommands, this);
-       stats->BoundPortCount = BindPorts(true);
+       stats->BoundPortCount = BindPorts(true, found_ports);
 
        for(int t = 0; t < 255; t++)
                Config->global_implementation[t] = 0;
@@ -288,11 +291,16 @@ InspIRCd::InspIRCd(int argc, char** argv)
        /* Just in case no modules were loaded - fix for bug #101 */
        this->BuildISupport();
 
-       if (!stats->BoundPortCount)
+       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);
        }
+       
+       if (stats->BoundPortCount != (unsigned int)found_ports)
+       {
+               printf("\nWARNING: Not all your client ports could be bound --\n         starting anyway with %ld of %d client ports bound.\n", stats->BoundPortCount, found_ports);
+       }
 
        /* Add the listening sockets used for client inbound connections
         * to the socket engine
@@ -537,26 +545,33 @@ bool InspIRCd::UnloadModule(const char* filename)
 
 bool InspIRCd::LoadModule(const char* filename)
 {
+       /* Do we have a glob pattern in the filename?
+        * The user wants to load multiple modules which
+        * match the pattern.
+        */
        if (strchr(filename,'*') || (strchr(filename,'?')))
        {
-               bool all_success = true;
                int n_match = 0;
                DIR* library = opendir(Config->ModPath);
                if (library)
                {
+                       /* Try and locate and load all modules matching the pattern */
                        dirent* entry = NULL;
                        while ((entry = readdir(library)))
                        {
                                if (this->MatchText(entry->d_name, filename))
                                {
-                                       n_match++;
                                        if (!this->LoadModule(entry->d_name))
-                                               all_success = false;
+                                               n_match++;
                                }
                        }
                        closedir(library);
                }
-               return (all_success && n_match);
+               /* Loadmodule will now return false if any one of the modules failed
+                * to load (but wont abort when it encounters a bad one) and when 1 or
+                * more modules were actually loaded.
+                */
+               return (n_match > 0);
        }
 
        char modfile[MAXBUF];
@@ -790,11 +805,21 @@ int InspIRCd::GetModuleCount()
        return this->ModCount;
 }
 
-time_t InspIRCd::Time()
+time_t InspIRCd::Time(bool delta)
 {
+       if (delta)
+               return TIME + time_delta;
        return TIME;
 }
 
+int InspIRCd::SetTimeDelta(int delta)
+{
+       int old = time_delta;
+       time_delta += delta;
+       this->Log(DEBUG, "Time delta set to %d (was %d)", time_delta, old);
+       return old;
+}
+
 bool FileLogger::Readable()
 {
        return false;