X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=ad7efdb06d70f1f670c9e4b47bdf6867d3862f98;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=6ea939e50180f90a4aa4105dd52907f860037946;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 6ea939e50..ad7efdb06 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -82,7 +82,7 @@ Event::Event(char* anydata, Module* src, const std::string &eventid) : data(anyd char* Event::GetData() { - return (char*)this->data; + return this->data; } Module* Event::GetSource() @@ -111,12 +111,14 @@ int Module::OnSendSnotice(char &snomask, std::string &type, const std::string & void Module::OnUserConnect(User*) { } void Module::OnUserQuit(User*, const std::string&, const std::string&) { } void Module::OnUserDisconnect(User*) { } -void Module::OnUserJoin(User*, Channel*, bool, bool&) { } +void Module::OnUserJoin(User*, Channel*, bool, bool&, bool) { } void Module::OnPostJoin(User*, Channel*) { } void Module::OnUserPart(User*, Channel*, std::string&, bool&) { } -void Module::OnRehash(User*, const std::string&) { } +void Module::OnPreRehash(User*, const std::string&) { } +void Module::OnModuleRehash(User*, const std::string&) { } +void Module::OnRehash(User*) { } int Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; } -void Module::OnMode(User*, void*, int, const std::deque&, const std::deque&) { } +void Module::OnMode(User*, void*, int, const std::vector&, const std::vector&) { } Version Module::GetVersion() { return Version("Misconfigured", VF_VENDOR, -1); } void Module::OnOper(User*, const std::string&) { } void Module::OnPostOper(User*, const std::string&, const std::string &) { } @@ -157,7 +159,7 @@ void Module::OnGlobalOper(User*) { } void Module::OnPostConnect(User*) { } int Module::OnAddBan(User*, Channel*, const std::string &) { return 0; } int Module::OnDelBan(User*, Channel*, const std::string &) { return 0; } -void Module::OnRawSocketAccept(int, const std::string&, int) { } +void Module::OnRawSocketAccept(int, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { } int Module::OnRawSocketWrite(int, const char*, int) { return 0; } void Module::OnRawSocketClose(int) { } void Module::OnRawSocketConnect(int) { } @@ -170,12 +172,11 @@ void Module::OnPostLocalTopicChange(User*, Channel*, const std::string&) { } void Module::OnGetServerDescription(const std::string&, std::string&) { } void Module::OnSyncUser(User*, Module*, void*) { } void Module::OnSyncChannel(Channel*, Module*, void*) { } -void Module::ProtoSendMode(void*, TargetTypeFlags, void*, const std::deque&, const std::deque&) { } -void Module::OnSyncChannelMetaData(Channel*, Module*, void*, const std::string&, bool) { } -void Module::OnSyncUserMetaData(User*, Module*, void*, const std::string&, bool) { } -void Module::OnSyncOtherMetaData(Module*, void*, bool) { } -void Module::OnDecodeMetaData(int, void*, const std::string&, const std::string&) { } -void Module::ProtoSendMetaData(void*, TargetTypeFlags, void*, const std::string&, const std::string&) { } +void Module::OnSyncNetwork(Module*, void*) { } +void Module::ProtoSendMode(void*, TargetTypeFlags, void*, const std::vector&, const std::vector&) { } +void Module::OnDecodeMetaData(Extensible*, const std::string&, const std::string&) { } +void Module::ProtoSendMetaData(void*, Extensible*, const std::string&, const std::string&) { } +std::string Module::ProtoTranslate(Extensible*) { return "?"; } void Module::OnWallops(User*, const std::string&) { } void Module::OnChangeHost(User*, const std::string&) { } void Module::OnChangeName(User*, const std::string&) { } @@ -195,7 +196,7 @@ 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&) { } +void Module::OnHookUserIO(User*) { } bool Module::OnHostCycle(User* user) { return false; } ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins) @@ -286,11 +287,16 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Modul break; /* Module wants to be first, sod everything else */ case PRIORITY_FIRST: - swap_pos = 0; + if (prioritizationState != PRIO_STATE_FIRST) + swap = false; + else + swap_pos = 0; break; - /* Module is submissive and wants to be last... awww. */ + /* Module wants to be last. */ case PRIORITY_LAST: - if (EventHandlers[i].empty()) + if (prioritizationState != PRIO_STATE_FIRST) + swap = false; + else if (EventHandlers[i].empty()) swap_pos = 0; else swap_pos = EventHandlers[i].size() - 1; @@ -337,6 +343,9 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Modul /* Do we need to swap? */ if (swap && (swap_pos != source)) { + // We are going to change positions; we'll need to run again to verify all requirements + if (prioritizationState == PRIO_STATE_LAST) + prioritizationState = PRIO_STATE_AGAIN; /* Suggestion from Phoenix, "shuffle" the modules to better retain call order */ int incrmnt = 1; @@ -369,7 +378,7 @@ bool ModuleManager::Load(const char* filename) if (strchr(filename,'*') || (strchr(filename,'?'))) { int n_match = 0; - DIR* library = opendir(Instance->Config->ModPath); + DIR* library = opendir(Instance->Config->ModPath.c_str()); if (library) { /* Try and locate and load all modules matching the pattern */ @@ -392,16 +401,9 @@ bool ModuleManager::Load(const char* filename) } char modfile[MAXBUF]; - snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,filename); + snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath.c_str(),filename); std::string filename_str = filename; - if (!ServerConfig::DirValid(modfile)) - { - LastModuleError = "Module " + std::string(filename) + " is not in the module directory that i am configured to look in (is "+Instance->Config->ModPath+" really a symlink?)"; - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); - return false; - } - if (!ServerConfig::FileExists(modfile)) { LastModuleError = "Module file could not be found: " + filename_str; @@ -497,8 +499,17 @@ bool ModuleManager::Load(const char* filename) * not just the one thats loading, as the new module could affect the preference * of others */ - for (std::map >::iterator n = Modules.begin(); n != Modules.end(); ++n) - n->second.second->Prioritize(); + for(int tries = 0; tries < 20; tries++) + { + prioritizationState = tries > 0 ? PRIO_STATE_LAST : PRIO_STATE_FIRST; + for (std::map >::iterator n = Modules.begin(); n != Modules.end(); ++n) + n->second.second->Prioritize(); + + if (prioritizationState == PRIO_STATE_LAST) + break; + if (tries == 19) + Instance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename_str); + } Instance->BuildISupport(); return true; @@ -566,9 +577,9 @@ void ModuleManager::LoadAll() char configToken[MAXBUF]; ModCount = -1; - for(int count = 0; count < Instance->Config->ConfValueEnum(Instance->Config->config_data, "module"); count++) + for(int count = 0; count < Instance->Config->ConfValueEnum("module"); count++) { - Instance->Config->ConfValue(Instance->Config->config_data, "module", "name", count, configToken, MAXBUF); + Instance->Config->ConfValue("module", "name", count, configToken, MAXBUF); printf_c("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken); if (!this->Load(configToken)) @@ -771,11 +782,6 @@ void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringst User->WriteServ(CompleteLine); } -User* FindDescriptorHandler::Call(int socket) -{ - return reinterpret_cast(Server->SE->GetRef(socket)); -} - bool InspIRCd::AddResolver(Resolver* r, bool cached) { if (!cached) @@ -809,36 +815,12 @@ const std::vector ModuleManager::GetAllModuleNames(int filter) ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance) { - this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out); - this->error = CONF_NO_ERROR; - this->data = &ServerInstance->Config->config_data; - this->privatehash = false; this->error = 0; } ConfigReader::~ConfigReader() { - if (this->errorlog) - delete this->errorlog; - if(this->privatehash) - delete this->data; -} - - -ConfigReader::ConfigReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance) -{ - ServerInstance->Config->ClearStack(); - - this->error = CONF_NO_ERROR; - this->data = new ConfigDataHash; - this->privatehash = true; - this->errorlog = new std::ostringstream(std::stringstream::in | std::stringstream::out); - /*** XXX: This might block! */ - this->readerror = ServerInstance->Config->DoInclude(*this->data, filename, *this->errorlog); - if (!this->readerror) - this->error = CONF_FILE_NOT_FOUND; - this->error = 0; } @@ -847,7 +829,7 @@ std::string ConfigReader::ReadValue(const std::string &tag, const std::string &n /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */ std::string result; - if (!ServerInstance->Config->ConfValue(*this->data, tag, name, default_value, index, result, allow_linefeeds)) + if (!ServerInstance->Config->ConfValue(tag, name, default_value, index, result, allow_linefeeds)) { this->error = CONF_VALUE_NOT_FOUND; } @@ -861,7 +843,7 @@ std::string ConfigReader::ReadValue(const std::string &tag, const std::string &n bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index) { - return ServerInstance->Config->ConfValueBool(*this->data, tag, name, default_value, index); + return ServerInstance->Config->ConfValueBool(tag, name, default_value, index); } bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index) @@ -874,7 +856,7 @@ int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, c { int result; - if(!ServerInstance->Config->ConfValueInteger(*this->data, tag, name, default_value, index, result)) + if(!ServerInstance->Config->ConfValueInteger(tag, name, default_value, index, result)) { this->error = CONF_VALUE_NOT_FOUND; return 0; @@ -901,28 +883,16 @@ long ConfigReader::GetError() return olderr; } -void ConfigReader::DumpErrors(bool bail, User* user) -{ - ServerInstance->Config->ReportConfigError(this->errorlog->str(), bail, user->uuid); -} - - int ConfigReader::Enumerate(const std::string &tag) { - return ServerInstance->Config->ConfValueEnum(*this->data, tag); + return ServerInstance->Config->ConfValueEnum(tag); } int ConfigReader::EnumerateValues(const std::string &tag, int index) { - return ServerInstance->Config->ConfVarEnum(*this->data, tag, index); + return ServerInstance->Config->ConfVarEnum(tag, index); } -bool ConfigReader::Verify() -{ - return this->readerror; -} - - FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance) { LoadFile(filename);