X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=d3de60f6a850d6399b1b0859c1f40df76cb673c4;hb=12ffb909a66401f540234aecbeeee6f94ef2fc6d;hp=cd869585f447bc6a34149df2e20ef43ba0b1fdcb;hpb=20bea3078d67a090ebcca64bf3cdbd7e6ab6adb6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index cd869585f..d3de60f6a 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -66,7 +66,7 @@ Module* Request::GetDest() return this->dest; } -char* Request::Send() +const char* Request::Send() { if (this->dest) { @@ -106,24 +106,22 @@ std::string Event::GetEventID() Module::Module(InspIRCd* Me) : ServerInstance(Me) { } Module::~Module() { } -void Module::OnReadConfig(ServerConfig*, ConfigReader*) { } -int Module::OnDownloadFile(const std::string&, std::istream*&) { return 0; } 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::OnPostJoin(User*, Channel*) { } -void Module::OnUserPart(User*, Channel*, const std::string&, bool&) { } +void Module::OnUserPart(User*, Channel*, std::string&, bool&) { } void Module::OnRehash(User*, const std::string&) { } void Module::OnServerRaw(std::string&, bool, User*) { } -int Module::OnUserPreJoin(User*, Channel*, const char*, std::string&) { return 0; } +int Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return 0; } void Module::OnMode(User*, void*, int, const std::string&) { } Version Module::GetVersion() { return Version(1,0,0,0,VF_VENDOR,-1); } void Module::OnOper(User*, const std::string&) { } void Module::OnPostOper(User*, const std::string&, const std::string &) { } void Module::OnInfo(User*) { } void Module::OnWhois(User*, User*) { } -int Module::OnUserPreInvite(User*, User*, Channel*) { return 0; } +int Module::OnUserPreInvite(User*, User*, Channel*, time_t) { return 0; } int Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList&) { return 0; } int Module::OnUserPreNotice(User*, void*, int, std::string&, char, CUList&) { return 0; } int Module::OnUserPreNick(User*, const std::string&) { return 0; } @@ -134,23 +132,24 @@ int Module::OnKill(User*, User*, const std::string&) { return 0; } void Module::OnLoadModule(Module*, const std::string&) { } void Module::OnUnloadModule(Module*, const std::string&) { } void Module::OnBackgroundTimer(time_t) { } -int Module::OnPreCommand(const std::string&, const char**, int, User *, bool, const std::string&) { return 0; } -void Module::OnPostCommand(const std::string&, const char**, int, User *, CmdResult, const std::string&) { } +int Module::OnPreCommand(std::string&, std::vector&, User *, bool, const std::string&) { return 0; } +void Module::OnPostCommand(const std::string&, const std::vector&, User *, CmdResult, const std::string&) { } bool Module::OnCheckReady(User*) { return true; } int Module::OnUserRegister(User*) { return 0; } int Module::OnUserPreKick(User*, User*, Channel*, const std::string&) { return 0; } void Module::OnUserKick(User*, User*, Channel*, const std::string&, bool&) { } -int Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int) { return 0; } +int Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int, bool) { return 0; } int Module::OnCheckInvite(User*, Channel*) { return 0; } int Module::OnCheckKey(User*, Channel*, const std::string&) { return 0; } int Module::OnCheckLimit(User*, Channel*) { return 0; } int Module::OnCheckBan(User*, Channel*) { return 0; } +int Module::OnCheckExtBan(User *, Channel *, char) { return 0; } int Module::OnStats(char, User*, string_list&) { return 0; } int Module::OnChangeLocalUserHost(User*, const std::string&) { return 0; } int Module::OnChangeLocalUserGECOS(User*, const std::string&) { return 0; } int Module::OnLocalTopicChange(User*, Channel*, const std::string&) { return 0; } void Module::OnEvent(Event*) { return; } -char* Module::OnRequest(Request*) { return NULL; } +const char* Module::OnRequest(Request*) { return NULL; } int Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return 0; } void Module::OnGlobalOper(User*) { } void Module::OnPostConnect(User*) { } @@ -164,7 +163,7 @@ int Module::OnRawSocketRead(int, char*, unsigned int, int&) { return 0; } void Module::OnUserMessage(User*, void*, int, const std::string&, char, const CUList&) { } void Module::OnUserNotice(User*, void*, int, const std::string&, char, const CUList&) { } void Module::OnRemoteKill(User*, User*, const std::string&, const std::string&) { } -void Module::OnUserInvite(User*, User*, Channel*) { } +void Module::OnUserInvite(User*, User*, Channel*, time_t) { } void Module::OnPostLocalTopicChange(User*, Channel*, const std::string&) { } void Module::OnGetServerDescription(const std::string&, std::string&) { } void Module::OnSyncUser(User*, Module*, void*) { } @@ -184,15 +183,17 @@ void Module::OnExpireLine(XLine*) { } void Module::OnCleanup(int, void*) { } int Module::OnChannelPreDelete(Channel*) { return 0; } void Module::OnChannelDelete(Channel*) { } -void Module::OnSetAway(User*) { } -void Module::OnCancelAway(User*) { } +int Module::OnSetAway(User*, const std::string &) { return 0; } int Module::OnUserList(User*, Channel*, CUList*&) { return 0; } int Module::OnWhoisLine(User*, User*, int&, std::string&) { return 0; } void Module::OnBuildExemptList(MessageType, Channel*, User*, char, CUList&, const std::string&) { } 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 +251,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; @@ -332,7 +333,21 @@ bool ModuleManager::SetPriority(Module* mod, Implementation i, PriorityState s, /* Do we need to swap? */ if (swap && (swap_pos != source)) - std::swap(EventHandlers[i][swap_pos], EventHandlers[i][source]); + { + /* Suggestion from Phoenix, "shuffle" the modules to better retain call order */ + int incrmnt = 1; + + if (source > swap_pos) + incrmnt = -1; + + for (unsigned int j = source; j != swap_pos; j += incrmnt) + { + if (( j + incrmnt > EventHandlers[i].size() - 1) || (j + incrmnt < 0)) + continue; + + std::swap(EventHandlers[i][j], EventHandlers[i][j+incrmnt]); + } + } return true; } @@ -356,7 +371,7 @@ bool ModuleManager::Load(const char* filename) { /* Try and locate and load all modules matching the pattern */ dirent* entry = NULL; - while ((entry = readdir(library))) + while (0 != (entry = readdir(library))) { if (Instance->MatchText(entry->d_name, filename)) { @@ -379,22 +394,22 @@ bool ModuleManager::Load(const char* filename) if (!ServerConfig::DirValid(modfile)) { - LastModuleError = "Module " + filename_str + " is not within the modules directory."; - Instance->Log(DEFAULT, LastModuleError); + 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->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 +434,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 +448,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 +461,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 +472,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 +483,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 +511,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 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; } @@ -512,7 +527,7 @@ bool ModuleManager::Unload(const char* filename) { modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second); } - for (user_hash::iterator u = Instance->clientlist->begin(); u != Instance->clientlist->end(); u++) + for (user_hash::iterator u = Instance->Users->clientlist->begin(); u != Instance->Users->clientlist->end(); u++) { modfind->second.second->OnCleanup(TYPE_USER,u->second); } @@ -531,14 +546,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 +570,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); } @@ -602,14 +617,12 @@ bool ModuleManager::PublishInterface(const std::string &InterfaceName, Module* M modulelist ml; ml.push_back(Mod); Interfaces[InterfaceName] = std::make_pair(0, ml); - return true; } else { iter->second.second.push_back(Mod); - return true; } - return false; + return true; } bool ModuleManager::UnpublishInterface(const std::string &InterfaceName, Module* Mod) @@ -641,6 +654,19 @@ modulelist* ModuleManager::FindInterface(const std::string &InterfaceName) return &(iter->second.second); } +bool ModuleManager::ModuleHasInterface(Module* mod, const std::string& InterfaceName) +{ + interfacelist::iterator iter = Interfaces.find(InterfaceName); + if (iter == Interfaces.end()) + return false; + else + { + modulelist& ml = iter->second.second; + modulelist::iterator mi = std::find(ml.begin(), ml.end(), mod); + return (mi != ml.end()); + } +} + void ModuleManager::UseInterface(const std::string &InterfaceName) { interfacelist::iterator iter = Interfaces.find(InterfaceName); @@ -704,12 +730,12 @@ Channel* InspIRCd::GetChannelIndex(long index) bool InspIRCd::MatchText(const std::string &sliteral, const std::string &spattern) { - return match(sliteral.c_str(),spattern.c_str()); + return match(sliteral, spattern); } -CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const char** parameters, int pcnt, User* user) +CmdResult InspIRCd::CallCommandHandler(const std::string &commandname, const std::vector& parameters, User* user) { - return this->Parser->CallHandler(commandname,parameters,pcnt,user); + return this->Parser->CallHandler(commandname, parameters, user); } bool InspIRCd::IsValidModuleCommand(const std::string &commandname, int pcnt, User* user) @@ -726,12 +752,12 @@ void InspIRCd::AddCommand(Command *f) } } -void InspIRCd::SendMode(const char** parameters, int pcnt, User *user) +void InspIRCd::SendMode(const std::vector& parameters, User *user) { - this->Modes->Process(parameters,pcnt,user,true); + this->Modes->Process(parameters, user, true); } -void InspIRCd::DumpText(User* User, const std::string &LinePrefix, stringstream &TextStream) +void InspIRCd::DumpText(User* User, const std::string &LinePrefix, std::stringstream &TextStream) { std::string CompleteLine = LinePrefix; std::string Word; @@ -809,11 +835,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; }