X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules.cpp;h=67c90b128b401e3dbd045f11dd3564d62ef08cf5;hb=075bb82c3ebdf4e77f14134ca8343631dd4cfbcd;hp=cec146f76a7eb791bbcb25fbb27e68254d2786d9;hpb=f4472dd6dcdfbb5d4a2a50ddc615644c3b2c8145;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules.cpp b/src/modules.cpp index cec146f76..67c90b128 100644 --- a/src/modules.cpp +++ b/src/modules.cpp @@ -28,7 +28,7 @@ // version is a simple class for holding a modules version number Version::Version(const std::string &modv, int flags, int api_ver, const std::string& rev) -: version(modv + " " + rev), Flags(flags), API(api_ver) +: description(modv), version(rev), Flags(flags), API(api_ver) { } @@ -90,7 +90,7 @@ Module* Event::GetSource() return this->source; } -char* Event::Send(InspIRCd* ServerInstance) +char* Event::Send() { FOREACH_MOD(I_OnEvent,OnEvent(this)); return NULL; @@ -104,22 +104,21 @@ std::string Event::GetEventID() // These declarations define the behavours of the base class Module (which does nothing at all) -Module::Module(InspIRCd* Me) : ServerInstance(Me) { } +Module::Module() { } Module::~Module() { } ModResult Module::OnSendSnotice(char &snomask, std::string &type, const std::string &message) { return MOD_RES_PASSTHRU; } 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&, bool) { } -void Module::OnPostJoin(User*, Channel*) { } -void Module::OnUserPart(User*, Channel*, std::string&, bool&) { } +void Module::OnUserJoin(Membership*, bool, bool, CUList&) { } +void Module::OnPostJoin(Membership*) { } +void Module::OnUserPart(Membership*, std::string&, CUList&) { } void Module::OnPreRehash(User*, const std::string&) { } void Module::OnModuleRehash(User*, const std::string&) { } void Module::OnRehash(User*) { } ModResult Module::OnUserPreJoin(User*, Channel*, const char*, std::string&, const std::string&) { return MOD_RES_PASSTHRU; } 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 &) { } void Module::OnInfo(User*) { } @@ -129,7 +128,7 @@ ModResult Module::OnUserPreMessage(User*, void*, int, std::string&, char, CUList ModResult Module::OnUserPreNotice(User*, void*, int, std::string&, char, CUList&) { return MOD_RES_PASSTHRU; } ModResult Module::OnUserPreNick(User*, const std::string&) { return MOD_RES_PASSTHRU; } void Module::OnUserPostNick(User*, const std::string&) { } -ModResult Module::OnAccessCheck(User*, User*, Channel*, int) { return MOD_RES_PASSTHRU; } +ModResult Module::OnPreMode(User*, User*, Channel*, const std::vector&) { return MOD_RES_PASSTHRU; } void Module::On005Numeric(std::string&) { } ModResult Module::OnKill(User*, User*, const std::string&) { return MOD_RES_PASSTHRU; } void Module::OnLoadModule(Module*, const std::string&) { } @@ -139,19 +138,19 @@ ModResult Module::OnPreCommand(std::string&, std::vector&, User *, void Module::OnPostCommand(const std::string&, const std::vector&, User *, CmdResult, const std::string&) { } ModResult Module::OnCheckReady(User*) { return MOD_RES_PASSTHRU; } ModResult Module::OnUserRegister(User*) { return MOD_RES_PASSTHRU; } -ModResult Module::OnUserPreKick(User*, User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; } -void Module::OnUserKick(User*, User*, Channel*, const std::string&, bool&) { } +ModResult Module::OnUserPreKick(User*, Membership*, const std::string&) { return MOD_RES_PASSTHRU; } +void Module::OnUserKick(User*, Membership*, const std::string&, CUList&) { } ModResult Module::OnRawMode(User*, Channel*, const char, const std::string &, bool, int) { return MOD_RES_PASSTHRU; } ModResult Module::OnCheckInvite(User*, Channel*) { return MOD_RES_PASSTHRU; } ModResult Module::OnCheckKey(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; } ModResult Module::OnCheckLimit(User*, Channel*) { return MOD_RES_PASSTHRU; } -ModResult Module::OnCheckBan(User*, Channel*) { return MOD_RES_PASSTHRU; } -ModResult Module::OnCheckExtBan(User *, Channel *, char) { return MOD_RES_PASSTHRU; } -ModResult Module::OnCheckStringExtBan(const std::string &s, Channel *c, char type) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckChannelBan(User*, Channel*) { return MOD_RES_PASSTHRU; } +ModResult Module::OnCheckBan(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnExtBanCheck(User*, Channel*, char) { return MOD_RES_PASSTHRU; } ModResult Module::OnStats(char, User*, string_list&) { return MOD_RES_PASSTHRU; } ModResult Module::OnChangeLocalUserHost(User*, const std::string&) { return MOD_RES_PASSTHRU; } ModResult Module::OnChangeLocalUserGECOS(User*, const std::string&) { return MOD_RES_PASSTHRU; } -ModResult Module::OnLocalTopicChange(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnPreTopicChange(User*, Channel*, const std::string&) { return MOD_RES_PASSTHRU; } void Module::OnEvent(Event*) { return; } const char* Module::OnRequest(Request*) { return NULL; } ModResult Module::OnPassCompare(Extensible* ex, const std::string &password, const std::string &input, const std::string& hashtype) { return MOD_RES_PASSTHRU; } @@ -159,16 +158,16 @@ void Module::OnGlobalOper(User*) { } void Module::OnPostConnect(User*) { } ModResult Module::OnAddBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; } ModResult Module::OnDelBan(User*, Channel*, const std::string &) { return MOD_RES_PASSTHRU; } -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) { } -int Module::OnRawSocketRead(int, char*, unsigned int, int&) { return 0; } +void Module::OnStreamSocketAccept(StreamSocket*, irc::sockets::sockaddrs*, irc::sockets::sockaddrs*) { } +int Module::OnStreamSocketWrite(StreamSocket*, std::string&) { return -1; } +void Module::OnStreamSocketClose(StreamSocket*) { } +void Module::OnStreamSocketConnect(StreamSocket*) { } +int Module::OnStreamSocketRead(StreamSocket*, std::string&) { return -1; } 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*, time_t) { } -void Module::OnPostLocalTopicChange(User*, Channel*, const std::string&) { } +void Module::OnPostTopicChange(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*) { } @@ -176,7 +175,6 @@ 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&) { } @@ -188,20 +186,19 @@ void Module::OnCleanup(int, void*) { } ModResult Module::OnChannelPreDelete(Channel*) { return MOD_RES_PASSTHRU; } void Module::OnChannelDelete(Channel*) { } ModResult Module::OnSetAway(User*, const std::string &) { return MOD_RES_PASSTHRU; } -ModResult Module::OnUserList(User*, Channel*, CUList*&) { return MOD_RES_PASSTHRU; } +ModResult Module::OnUserList(User*, Channel*) { return MOD_RES_PASSTHRU; } ModResult Module::OnWhoisLine(User*, User*, int&, std::string&) { return MOD_RES_PASSTHRU; } 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&) { } +void Module::OnNamesListItem(User*, Membership*, std::string&, std::string&) { } ModResult Module::OnNumeric(User*, unsigned int, const std::string&) { return MOD_RES_PASSTHRU; } -void Module::OnHookIO(EventHandler*, ListenSocketBase*) { } +void Module::OnHookIO(StreamSocket*, ListenSocketBase*) { } ModResult Module::OnHostCycle(User*) { return MOD_RES_PASSTHRU; } void Module::OnSendWhoLine(User*, User*, Channel*, std::string&) { } -ModuleManager::ModuleManager(InspIRCd* Ins) : ModCount(0), Instance(Ins) +ModuleManager::ModuleManager() : ModCount(0) { } @@ -380,7 +377,7 @@ bool ModuleManager::Load(const char* filename) if (strchr(filename,'*') || (strchr(filename,'?'))) { int n_match = 0; - DIR* library = opendir(Instance->Config->ModPath.c_str()); + DIR* library = opendir(ServerInstance->Config->ModPath.c_str()); if (library) { /* Try and locate and load all modules matching the pattern */ @@ -403,20 +400,20 @@ bool ModuleManager::Load(const char* filename) } char modfile[MAXBUF]; - snprintf(modfile,MAXBUF,"%s/%s",Instance->Config->ModPath.c_str(),filename); + snprintf(modfile,MAXBUF,"%s/%s",ServerInstance->Config->ModPath.c_str(),filename); std::string filename_str = filename; if (!ServerConfig::FileExists(modfile)) { LastModuleError = "Module file could not be found: " + filename_str; - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->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); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } @@ -428,7 +425,7 @@ bool ModuleManager::Load(const char* filename) /* This will throw a CoreException if there's a problem loading * the module file or getting a pointer to the init_module symbol. */ - newhandle = new ircd_module(Instance, modfile, "init_module"); + newhandle = new ircd_module(modfile, "init_module"); newmod = newhandle->CallInit(); if (newmod) @@ -442,12 +439,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->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } else { - Instance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (API version %d, Module version %s)%s", filename, v.API, v.version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]")); + ServerInstance->Logs->Log("MODULE", DEFAULT,"New module introduced: %s (API version %d, Module version %s)%s", filename, v.API, v.version.c_str(), (!(v.Flags & VF_VENDOR) ? " [3rd Party]" : " [Vendor]")); } Modules[filename_str] = std::make_pair(newhandle, newmod); @@ -456,7 +453,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->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } } @@ -469,7 +466,7 @@ bool ModuleManager::Load(const char* filename) if (newhandle) delete newhandle; LastModuleError = "Unable to load " + filename_str + ": Error when loading: " + modexcept.GetReason(); - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } catch (FindSymbolException& modexcept) @@ -480,7 +477,7 @@ bool ModuleManager::Load(const char* filename) if (newhandle) delete newhandle; LastModuleError = "Unable to load " + filename_str + ": Error finding symbol: " + modexcept.GetReason(); - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } catch (CoreException& modexcept) @@ -491,12 +488,12 @@ bool ModuleManager::Load(const char* filename) if (newhandle) delete newhandle; LastModuleError = "Unable to load " + filename_str + ": " + modexcept.GetReason(); - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } this->ModCount++; - FOREACH_MOD_I(Instance,I_OnLoadModule,OnLoadModule(newmod, filename_str)); + FOREACH_MOD(I_OnLoadModule,OnLoadModule(newmod, filename_str)); /* We give every module a chance to re-prioritize when we introduce a new one, * not just the one thats loading, as the new module could affect the preference @@ -511,10 +508,10 @@ bool ModuleManager::Load(const char* filename) if (prioritizationState == PRIO_STATE_LAST) break; if (tries == 19) - Instance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename_str); + ServerInstance->Logs->Log("MODULE", DEFAULT, "Hook priority dependency loop detected while loading " + filename_str); } - Instance->BuildISupport(); + ServerInstance->BuildISupport(); return true; } @@ -528,49 +525,54 @@ bool ModuleManager::Unload(const char* filename) if (modfind->second.second->GetVersion().Flags & VF_STATIC) { LastModuleError = "Module " + filename_str + " not unloadable (marked static)"; - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->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->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } + std::vector items = Extensible::BeginUnregister(modfind->second.second); /* Give the module a chance to tidy out all its metadata */ - for (chan_hash::iterator c = Instance->chanlist->begin(); c != Instance->chanlist->end(); c++) + for (chan_hash::iterator c = ServerInstance->chanlist->begin(); c != ServerInstance->chanlist->end(); c++) { modfind->second.second->OnCleanup(TYPE_CHANNEL,c->second); + c->second->doUnhookExtensions(items); + const UserMembList* users = c->second->GetUsers(); + for(UserMembCIter mi = users->begin(); mi != users->end(); mi++) + mi->second->doUnhookExtensions(items); } - for (user_hash::iterator u = Instance->Users->clientlist->begin(); u != Instance->Users->clientlist->end(); u++) + for (user_hash::iterator u = ServerInstance->Users->clientlist->begin(); u != ServerInstance->Users->clientlist->end(); u++) { modfind->second.second->OnCleanup(TYPE_USER,u->second); + u->second->doUnhookExtensions(items); } /* Tidy up any dangling resolvers */ - Instance->Res->CleanResolvers(modfind->second.second); + ServerInstance->Res->CleanResolvers(modfind->second.second); - - FOREACH_MOD_I(Instance,I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first)); + FOREACH_MOD(I_OnUnloadModule,OnUnloadModule(modfind->second.second, modfind->first)); this->DetachAll(modfind->second.second); - Instance->Parser->RemoveCommands(modfind->second.second); + ServerInstance->Parser->RemoveCommands(modfind->second.second); delete modfind->second.second; delete modfind->second.first; Modules.erase(modfind); - Instance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename); + ServerInstance->Logs->Log("MODULE", DEFAULT,"Module %s unloaded",filename); this->ModCount--; - Instance->BuildISupport(); + ServerInstance->BuildISupport(); return true; } LastModuleError = "Module " + filename_str + " is not loaded, cannot unload it!"; - Instance->Logs->Log("MODULE", DEFAULT, LastModuleError); + ServerInstance->Logs->Log("MODULE", DEFAULT, LastModuleError); return false; } @@ -583,7 +585,7 @@ void ModuleManager::LoadAll() printf("\nLoading core commands"); fflush(stdout); - DIR* library = opendir(Instance->Config->ModPath.c_str()); + DIR* library = opendir(ServerInstance->Config->ModPath.c_str()); if (library) { dirent* entry = NULL; @@ -596,9 +598,9 @@ void ModuleManager::LoadAll() if (!Load(entry->d_name)) { - Instance->Logs->Log("MODULE", DEFAULT, this->LastError()); + ServerInstance->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); + ServerInstance->Exit(EXIT_STATUS_MODULE); } } } @@ -606,16 +608,16 @@ void ModuleManager::LoadAll() printf("\n"); } - for(int count = 0; count < Instance->Config->ConfValueEnum("module"); count++) + for(int count = 0; count < ServerInstance->Config->ConfValueEnum("module"); count++) { - Instance->Config->ConfValue("module", "name", count, configToken, MAXBUF); + ServerInstance->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)) { - Instance->Logs->Log("MODULE", DEFAULT, this->LastError()); + ServerInstance->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); + ServerInstance->Exit(EXIT_STATUS_MODULE); } } } @@ -874,7 +876,7 @@ const std::vector ModuleManager::GetAllModuleNames(int filter) return retval; } -ConfigReader::ConfigReader(InspIRCd* Instance) : ServerInstance(Instance) +ConfigReader::ConfigReader() { this->error = 0; } @@ -954,12 +956,12 @@ int ConfigReader::EnumerateValues(const std::string &tag, int index) return ServerInstance->Config->ConfVarEnum(tag, index); } -FileReader::FileReader(InspIRCd* Instance, const std::string &filename) : ServerInstance(Instance) +FileReader::FileReader(const std::string &filename) { LoadFile(filename); } -FileReader::FileReader(InspIRCd* Instance) : ServerInstance(Instance) +FileReader::FileReader() { }