Use the right pass

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

diff --git a/src/modules.cpp b/src/modules.cpp
index 81be2415441eac9938714f8dd555821cca894efe..5ec74da7b9bc43f5db57cd7ac6ef82cce36a4fe8 100644 (file)
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -192,7 +192,10 @@ void               Module::OnBuildExemptList(MessageType, Channel*, User*, char, CUList&, con
 void           Module::OnGarbageCollect() { }
 void           Module::OnBufferFlushed(User*) { }
 void           Module::OnText(User*, void*, int, const std::string&, char, CUList&) { }
-
+void           Module::OnRunTestSuite() { }
+void           Module::OnNamesListItem(User*, User*, Channel*, std::string&, std::string&) { }
+int            Module::OnNumeric(User*, unsigned int, const std::string&) { return 0; }
+void           Module::OnHookUserIO(User*, const std::string&) { }
 
 ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins)
 {
@@ -250,7 +253,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s,
         * on which they want, and we make sure our module is *at least* before or after
         * the first or last of this subset, depending again on the type of priority.
         */
-       size_t swap_pos;
+       size_t swap_pos = 0;
        size_t source = 0;
        bool swap = true;
        bool found = false;
@@ -380,21 +383,21 @@ bool ModuleManager::Load(const char* filename)
        if (!ServerConfig::DirValid(modfile))
        {
                LastModuleError = "Module " + filename_str + " is not within the modules directory.";
-               Instance->Log(DEFAULT, LastModuleError);
+               Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                return false;
        }
        
        if (!ServerConfig::FileExists(modfile))
        {
                LastModuleError = "Module file could not be found: " + filename_str;
-               Instance->Log(DEFAULT, LastModuleError);
+               Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                return false;
        }
        
        if (Modules.find(filename_str) != Modules.end())
        {       
                LastModuleError = "Module " + filename_str + " is already loaded, cannot load a module twice!";
-               Instance->Log(DEFAULT, LastModuleError);
+               Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                return false;
        }
                
@@ -419,12 +422,12 @@ bool ModuleManager::Load(const char* filename)
                                delete newmod;
                                delete newhandle;
                                LastModuleError = "Unable to load " + filename_str + ": Incorrect module API version: " + ConvToStr(v.API) + " (our version: " + ConvToStr(API_VERSION) + ")";
-                               Instance->Log(DEFAULT, LastModuleError);
+                               Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                                return false;
                        }
                        else
                        {
-                               Instance->Log(DEFAULT,"New module introduced: %s (API version %d, Module version %d.%d.%d.%d)%s", filename, v.API, v.Major, v.Minor, v.Revision, v.Build, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
+                               Instance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (API version %d, Module version %d.%d.%d.%d)%s", filename, v.API, v.Major, v.Minor, v.Revision, v.Build, (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]"));
                        }
 
                        Modules[filename_str] = std::make_pair(newhandle, newmod);
@@ -433,7 +436,7 @@ bool ModuleManager::Load(const char* filename)
                {
                        delete newhandle;
                        LastModuleError = "Unable to load " + filename_str + ": Probably missing init_module() entrypoint, but dlsym() didn't notice a problem";
-                       Instance->Log(DEFAULT, LastModuleError);
+                       Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                        return false;
                }
        }
@@ -446,7 +449,7 @@ bool ModuleManager::Load(const char* filename)
                if (newhandle)
                        delete newhandle;
                LastModuleError = "Unable to load " + filename_str + ": Error when loading: " + modexcept.GetReason();
-               Instance->Log(DEFAULT, LastModuleError);
+               Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                return false;
        }
        catch (FindSymbolException& modexcept)
@@ -457,7 +460,7 @@ bool ModuleManager::Load(const char* filename)
                if (newhandle)
                        delete newhandle;
                LastModuleError = "Unable to load " + filename_str + ": Error finding symbol: " + modexcept.GetReason();
-               Instance->Log(DEFAULT, LastModuleError);
+               Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                return false;
        }
        catch (CoreException& modexcept)
@@ -468,7 +471,7 @@ bool ModuleManager::Load(const char* filename)
                if (newhandle)
                        delete newhandle;
                LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason();
-               Instance->Log(DEFAULT, LastModuleError);
+               Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                return false;
        }
 
@@ -496,14 +499,14 @@ bool ModuleManager::Unload(const char* filename)
                if (modfind->second.second->GetVersion().Flags & VF_STATIC)
                {
                        LastModuleError = "Module " + filename_str + " not unloadable (marked static)";
-                       Instance->Log(DEFAULT, LastModuleError);
+                       Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                        return false;
                }
                std::pair<int,std::string> intercount = GetInterfaceInstanceCount(modfind->second.second);
                if (intercount.first > 0)
                {
                        LastModuleError = "Failed to unload module " + filename_str + ", being used by " + ConvToStr(intercount.first) + " other(s) via interface '" + intercount.second + "'";
-                       Instance->Log(DEFAULT, LastModuleError);
+                       Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
                        return false;
                }
 
@@ -531,14 +534,14 @@ bool ModuleManager::Unload(const char* filename)
                delete modfind->second.first;
                Modules.erase(modfind);
 
-               Instance->Log(DEFAULT,"Module %s unloaded",filename);
+               Instance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename);
                this->ModCount--;
                Instance->BuildISupport();
                return true;
        }
 
        LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!";
-       Instance->Log(DEFAULT, LastModuleError);
+       Instance->Logs->Log("MODULE", DEFAULT, LastModuleError);
        return false;
 }
 
@@ -555,7 +558,7 @@ void ModuleManager::LoadAll()
                
                if (!this->Load(configToken))           
                {
-                       Instance->Log(DEFAULT, this->LastError());
+                       Instance->Logs->Log("MODULE", DEFAULT, this->LastError());
                        printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str());
                        Instance->Exit(EXIT_STATUS_MODULE);
                }
@@ -822,11 +825,8 @@ ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : Se
        this->data = new ConfigDataHash;
        this->privatehash = true;
        this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out);
-       for (int pass = 0; pass < 2; pass++)
-       {
-               /*** XXX: Can return a 'not ready yet!' code! */
-               this->readerror = ServerInstance->Config->LoadConf(*this->data, filename, *this->errorlog, pass);
-       }
+       /*** XXX: This might block! */
+       this->readerror = ServerInstance->Config->DoInclude(*this->data, filename, *this->errorlog);
        if (!this->readerror)
                this->error = CONF_FILE_NOT_FOUND;
 }