X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=87e2de705c5c71b350458669cf4ebaf694451458;hb=0eabe028e25de0cf5037f523a8df72f1dd7e85bf;hp=4eca9492e0c95517f3f574bb09c9ebbb466daee2;hpb=adf20f648638da7ceece0268e1684b16fe4277b8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index 4eca9492e..87e2de705 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -25,6 +25,7 @@ #include #endif + // version is a simple class for holding a modules version number Version::Version(const std::string &sversion, int flags, int api_ver) : version(sversion), Flags(flags), API(api_ver) @@ -113,10 +114,11 @@ void Module::OnUserDisconnect(User*) { } void Module::OnUserJoin(User*, Channel*, bool, bool&) { } void Module::OnPostJoin(User*, Channel*) { } void Module::OnUserPart(User*, Channel*, std::string&, bool&) { } -void Module::OnRehash(User*, const std::string&) { } -void Module::OnServerRaw(std::string&, bool, User*) { } +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::string&) { } +void Module::OnMode(User*, void*, int, const std::deque&, const std::deque&) { } 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 &) { } @@ -170,7 +172,7 @@ 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::string&) { } +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) { } @@ -238,7 +240,7 @@ void ModuleManager::DetachAll(Module* mod) Detach((Implementation)n, mod); } -bool ModuleManager::SetPriority(Module* mod, PriorityState s) +bool ModuleManager::SetPriority(Module* mod, Priority s) { for (size_t n = I_BEGIN + 1; n != I_END; ++n) SetPriority(mod, (Implementation)n, s); @@ -246,7 +248,7 @@ bool ModuleManager::SetPriority(Module* mod, PriorityState s) return true; } -bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, Module** modules, size_t sz) +bool ModuleManager::SetPriority(Module* mod, Implementation i, Priority s, Module** modules, size_t sz) { /** To change the priority of a module, we first find its position in the vector, * then we find the position of the other modules in the vector that this module @@ -281,22 +283,22 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, switch (s) { /* Dummy value */ - case PRIO_DONTCARE: + case PRIORITY_DONTCARE: swap = false; break; /* Module wants to be first, sod everything else */ - case PRIO_FIRST: + case PRIORITY_FIRST: swap_pos = 0; break; /* Module is submissive and wants to be last... awww. */ - case PRIO_LAST: + case PRIORITY_LAST: if (EventHandlers[i].empty()) swap_pos = 0; else swap_pos = EventHandlers[i].size() - 1; break; /* Place this module after a set of other modules */ - case PRIO_AFTER: + case PRIORITY_AFTER: { /* Find the latest possible position */ swap_pos = 0; @@ -315,7 +317,7 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, } break; /* Place this module before a set of other modules */ - case PRIO_BEFORE: + case PRIORITY_BEFORE: { swap_pos = EventHandlers[i].size() - 1; swap = false; @@ -376,7 +378,7 @@ bool ModuleManager::Load(const char* filename) dirent* entry = NULL; while (0 != (entry = readdir(library))) { - if (InspIRCd::Match(entry->d_name, filename, NULL)) + if (InspIRCd::Match(entry->d_name, filename, ascii_case_insensitive_map)) { if (!this->Load(entry->d_name)) n_match++; @@ -388,34 +390,27 @@ bool ModuleManager::Load(const char* filename) * to load (but wont abort when it encounters a bad one) and when 1 or * more modules were actually loaded. */ - return (n_match > 0); + return (n_match > 0 ? false : true); } char modfile[MAXBUF]; snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath,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; 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->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } - + Module* newmod = NULL; ircd_module* newhandle = NULL; @@ -566,12 +561,12 @@ 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)) + + if (!this->Load(configToken)) { Instance->Logs->Log("MODULE", DEFAULT, this->LastError()); printf_c("\n[\033[1;31m*\033[0m] %s\n\n", this->LastError().c_str()); @@ -593,7 +588,7 @@ bool ModuleManager::PublishFeature(const std::string &FeatureName, Module* Mod) bool ModuleManager::UnpublishFeature(const std::string &FeatureName) { featurelist::iterator iter = Features.find(FeatureName); - + if (iter == Features.end()) return false; @@ -771,11 +766,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,43 +799,21 @@ 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; } std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds) { - /* Don't need to strlcpy() tag and name anymore, ReadConf() takes const char* */ + /* 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; } @@ -859,7 +827,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) @@ -871,19 +839,19 @@ bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool need_positive) { 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; } - + if ((need_positive) && (result < 0)) { this->error = CONF_INT_NEGATIVE; return 0; } - + return result; } @@ -899,28 +867,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);