]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Remove unused debug
[user/henk/code/inspircd.git] / src / inspircd.cpp
index 055e42a7321a980d7b75b6e9b0bb31814cc385de..8c297af07b45b2e65093b9bd3eddfd933e89ce41 100644 (file)
@@ -86,7 +86,7 @@ void InspIRCd::Start()
 {
        printf("\033[1;32mInspire Internet Relay Chat Server, compiled %s at %s\n",__DATE__,__TIME__);
        printf("(C) ChatSpike Development team.\033[0m\n\n");
-       printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, jamie\033[0m\n");
+       printf("Developers:\t\t\033[1;32mBrain, FrostyCoolSlug, w00t, Om, Special, pippijn, peavey\033[0m\n");
        printf("Others:\t\t\t\033[1;32mSee /INFO Output\033[0m\n");
        printf("Name concept:\t\t\033[1;32mLord_Zathras\033[0m\n\n");
 }
@@ -182,6 +182,9 @@ 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;
+       FailedPortList pl;
+
        modules.resize(255);
        factory.resize(255);
        
@@ -191,6 +194,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 +261,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, pl);
 
        for(int t = 0; t < 255; t++)
                Config->global_implementation[t] = 0;
@@ -288,11 +292,22 @@ 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 --\nstarting anyway with %ld of %d client ports bound.\n\n", stats->BoundPortCount, found_ports);
+               printf("The following port%s failed to bind:\n", found_ports - stats->BoundPortCount != 1 ? "s" : "");
+               int j = 1;
+               for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
+               {
+                       printf("%d.\tIP: %s\tPort: %lu\n", j, i->first.empty() ? "<all>" : i->first.c_str(), (unsigned long)i->second);
+               }
+       }
 
        /* Add the listening sockets used for client inbound connections
         * to the socket engine
@@ -490,6 +505,17 @@ bool InspIRCd::UnloadModule(const char* filename)
                                snprintf(MODERR,MAXBUF,"Module not unloadable (marked static)");
                                return false;
                        }
+                       std::pair<int,std::string> intercount = GetInterfaceInstanceCount(modules[j]);
+                       if (intercount.first > 0)
+                       {
+                               this->Log(DEFAULT,"Failed to unload module %s, being used by %d other(s) via interface '%s'",filename, intercount.first, intercount.second.c_str());
+                               snprintf(MODERR,MAXBUF,"Module not unloadable (Still in use by %d other module%s which %s using its interface '%s') -- unload dependent modules first!",
+                                               intercount.first,
+                                               intercount.first > 1 ? "s" : "",
+                                               intercount.first > 1 ? "are" : "is",
+                                               intercount.second.c_str());
+                               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++)
                        {
@@ -500,6 +526,9 @@ bool InspIRCd::UnloadModule(const char* filename)
                                modules[j]->OnCleanup(TYPE_USER,u->second);
                        }
 
+                       /* Tidy up any dangling resolvers */
+                       this->Res->CleanResolvers(modules[j]);
+
                        FOREACH_MOD_I(this,I_OnUnloadModule,OnUnloadModule(modules[j],Config->module_names[j]));
 
                        for(int t = 0; t < 255; t++)
@@ -537,24 +566,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))
                                {
                                        if (!this->LoadModule(entry->d_name))
-                                               all_success = false;
+                                               n_match++;
                                }
                        }
                        closedir(library);
                }
-               return all_success;
+               /* 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];
@@ -788,11 +826,44 @@ 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;
+}
+
+void InspIRCd::AddLocalClone(userrec* user)
+{
+       clonemap::iterator x = local_clones.find(user->GetIPString());
+       if (x != local_clones.end())
+               x->second++;
+       else
+               local_clones[user->GetIPString()] = 1;
+}
+
+void InspIRCd::AddGlobalClone(userrec* user)
+{
+       clonemap::iterator y = global_clones.find(user->GetIPString());
+       if (y != global_clones.end())
+               y->second++;
+       else
+               global_clones[user->GetIPString()] = 1;
+}
+
+int InspIRCd::GetTimeDelta()
+{
+       return time_delta;
+}
+
 bool FileLogger::Readable()
 {
        return false;