From 641b2d07ab6868a9fa6726c1bc36cde80005e155 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 7 Feb 2019 12:16:33 +0000 Subject: ModuleManager: remove fakederef. --- src/modules/extra/m_ldap.cpp | 4 ++-- src/modules/extra/m_mysql.cpp | 4 ++-- src/modules/extra/m_pgsql.cpp | 4 ++-- src/modules/extra/m_sqlite3.cpp | 4 ++-- src/modules/extra/m_ssl_gnutls.cpp | 4 ++-- src/modules/extra/m_ssl_mbedtls.cpp | 4 ++-- src/modules/extra/m_ssl_openssl.cpp | 4 ++-- src/modules/m_abbreviation.cpp | 2 +- src/modules/m_alias.cpp | 4 ++-- src/modules/m_callerid.cpp | 2 +- src/modules/m_clearchan.cpp | 6 +++--- src/modules/m_cloaking.cpp | 2 +- src/modules/m_conn_join.cpp | 2 +- src/modules/m_conn_umodes.cpp | 2 +- src/modules/m_customprefix.cpp | 2 +- src/modules/m_globalload.cpp | 12 ++++++------ src/modules/m_httpd_stats.cpp | 2 +- src/modules/m_messageflood.cpp | 2 +- src/modules/m_namedmodes.cpp | 2 +- src/modules/m_nicklock.cpp | 4 ++-- src/modules/m_ojoin.cpp | 2 +- src/modules/m_operprefix.cpp | 4 ++-- src/modules/m_password_hash.cpp | 8 ++++---- src/modules/m_pbkdf2.cpp | 2 +- src/modules/m_repeat.cpp | 2 +- src/modules/m_rline.cpp | 4 ++-- src/modules/m_samode.cpp | 8 ++++---- src/modules/m_sasl.cpp | 2 +- src/modules/m_showfile.cpp | 2 +- src/modules/m_shun.cpp | 4 ++-- src/modules/m_spanningtree/capab.cpp | 8 ++++---- src/modules/m_spanningtree/hmac.cpp | 2 +- src/modules/m_spanningtree/main.cpp | 2 +- src/modules/m_spanningtree/treesocket1.cpp | 2 +- src/modules/m_sqlauth.cpp | 4 ++-- 35 files changed, 64 insertions(+), 64 deletions(-) (limited to 'src/modules') diff --git a/src/modules/extra/m_ldap.cpp b/src/modules/extra/m_ldap.cpp index e2c5fd1c5..17c336760 100644 --- a/src/modules/extra/m_ldap.cpp +++ b/src/modules/extra/m_ldap.cpp @@ -544,7 +544,7 @@ class ModuleLDAP : public Module LDAPService* conn = new LDAPService(this, tag); conns[id] = conn; - ServerInstance->Modules->AddService(*conn); + ServerInstance->Modules.AddService(*conn); ServerInstance->Threads.Start(conn); } else @@ -557,7 +557,7 @@ class ModuleLDAP : public Module for (ServiceMap::iterator i = LDAPServices.begin(); i != LDAPServices.end(); ++i) { LDAPService* conn = i->second; - ServerInstance->Modules->DelService(*conn); + ServerInstance->Modules.DelService(*conn); conn->join(); conn->OnNotify(); delete conn; diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp index 4d2a206dc..a6fbb667b 100644 --- a/src/modules/extra/m_mysql.cpp +++ b/src/modules/extra/m_mysql.cpp @@ -428,7 +428,7 @@ void ModuleSQL::ReadConfig(ConfigStatus& status) { SQLConnection* conn = new SQLConnection(this, i->second); conns.insert(std::make_pair(id, conn)); - ServerInstance->Modules->AddService(*conn); + ServerInstance->Modules.AddService(*conn); } else { @@ -442,7 +442,7 @@ void ModuleSQL::ReadConfig(ConfigStatus& status) SQL::Error err(SQL::BAD_DBID); for(ConnMap::iterator i = connections.begin(); i != connections.end(); i++) { - ServerInstance->Modules->DelService(*i->second); + ServerInstance->Modules.DelService(*i->second); // it might be running a query on this database. Wait for that to complete i->second->lock.Lock(); i->second->lock.Unlock(); diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp index db9c8ac09..8fe81bc03 100644 --- a/src/modules/extra/m_pgsql.cpp +++ b/src/modules/extra/m_pgsql.cpp @@ -187,7 +187,7 @@ class SQLConn : public SQL::Provider, public EventHandler CullResult cull() override { this->SQL::Provider::cull(); - ServerInstance->Modules->DelService(*this); + ServerInstance->Modules.DelService(*this); return this->EventHandler::cull(); } @@ -554,7 +554,7 @@ class ModulePgSQL : public Module { SQLConn* conn = new SQLConn(this, i->second); conns.insert(std::make_pair(id, conn)); - ServerInstance->Modules->AddService(*conn); + ServerInstance->Modules.AddService(*conn); } else { diff --git a/src/modules/extra/m_sqlite3.cpp b/src/modules/extra/m_sqlite3.cpp index f1a3ddb21..5aef19308 100644 --- a/src/modules/extra/m_sqlite3.cpp +++ b/src/modules/extra/m_sqlite3.cpp @@ -235,7 +235,7 @@ class ModuleSQLite3 : public Module for(ConnMap::iterator i = conns.begin(); i != conns.end(); i++) { SQLConn* conn = i->second; - ServerInstance->Modules->DelService(*conn); + ServerInstance->Modules.DelService(*conn); delete conn; } conns.clear(); @@ -251,7 +251,7 @@ class ModuleSQLite3 : public Module continue; SQLConn* conn = new SQLConn(this, i->second); conns.insert(std::make_pair(i->second->getString("id"), conn)); - ServerInstance->Modules->AddService(*conn); + ServerInstance->Modules.AddService(*conn); } } diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 2f7569d70..77f2fb377 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -1223,12 +1223,12 @@ class GnuTLSIOHookProvider : public IOHookProvider : IOHookProvider(mod, "ssl/" + config.name, IOHookProvider::IOH_SSL) , profile(config) { - ServerInstance->Modules->AddService(*this); + ServerInstance->Modules.AddService(*this); } ~GnuTLSIOHookProvider() { - ServerInstance->Modules->DelService(*this); + ServerInstance->Modules.DelService(*this); } void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override diff --git a/src/modules/extra/m_ssl_mbedtls.cpp b/src/modules/extra/m_ssl_mbedtls.cpp index fbefbab07..22f775f29 100644 --- a/src/modules/extra/m_ssl_mbedtls.cpp +++ b/src/modules/extra/m_ssl_mbedtls.cpp @@ -812,12 +812,12 @@ class mbedTLSIOHookProvider : public IOHookProvider : IOHookProvider(mod, "ssl/" + config.name, IOHookProvider::IOH_SSL) , profile(config) { - ServerInstance->Modules->AddService(*this); + ServerInstance->Modules.AddService(*this); } ~mbedTLSIOHookProvider() { - ServerInstance->Modules->DelService(*this); + ServerInstance->Modules.DelService(*this); } void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp index 5018cff86..538ac7ff4 100644 --- a/src/modules/extra/m_ssl_openssl.cpp +++ b/src/modules/extra/m_ssl_openssl.cpp @@ -894,12 +894,12 @@ class OpenSSLIOHookProvider : public IOHookProvider : IOHookProvider(mod, "ssl/" + profilename, IOHookProvider::IOH_SSL) , profile(profilename, tag) { - ServerInstance->Modules->AddService(*this); + ServerInstance->Modules.AddService(*this); } ~OpenSSLIOHookProvider() { - ServerInstance->Modules->DelService(*this); + ServerInstance->Modules.DelService(*this); } void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) override diff --git a/src/modules/m_abbreviation.cpp b/src/modules/m_abbreviation.cpp index 4745a68af..c0db85090 100644 --- a/src/modules/m_abbreviation.cpp +++ b/src/modules/m_abbreviation.cpp @@ -30,7 +30,7 @@ class ModuleAbbreviation : public Module public: void Prioritize() override { - ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_FIRST); + ServerInstance->Modules.SetPriority(this, I_OnPreCommand, PRIORITY_FIRST); } Version GetVersion() override diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 99f362522..1f9d008cd 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -381,8 +381,8 @@ class ModuleAlias : public Module void Prioritize() override { // Prioritise after spanningtree so that channel aliases show the alias before the effects. - Module* linkmod = ServerInstance->Modules->Find("m_spanningtree.so"); - ServerInstance->Modules->SetPriority(this, I_OnUserPostMessage, PRIORITY_AFTER, linkmod); + Module* linkmod = ServerInstance->Modules.Find("m_spanningtree.so"); + ServerInstance->Modules.SetPriority(this, I_OnUserPostMessage, PRIORITY_AFTER, linkmod); } }; diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp index 0a1b64c48..4ee2a4492 100644 --- a/src/modules/m_callerid.cpp +++ b/src/modules/m_callerid.cpp @@ -449,7 +449,7 @@ public: void Prioritize() override { // Want to be after modules like silence or services_account - ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST); + ServerInstance->Modules.SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST); } }; diff --git a/src/modules/m_clearchan.cpp b/src/modules/m_clearchan.cpp index 41c681cf5..99b55fb85 100644 --- a/src/modules/m_clearchan.cpp +++ b/src/modules/m_clearchan.cpp @@ -89,7 +89,7 @@ class CommandClearChan : public Command // Attach to the appropriate hook so we're able to hide the QUIT/KICK messages Implementation hook = (kick ? I_OnUserKick : I_OnBuildNeighborList); - ServerInstance->Modules->Attach(hook, creator); + ServerInstance->Modules.Attach(hook, creator); std::string mask; // Now remove all local non-opers from the channel @@ -132,7 +132,7 @@ class CommandClearChan : public Command ServerInstance->Users->QuitUser(curr, reason); } - ServerInstance->Modules->Detach(hook, creator); + ServerInstance->Modules.Detach(hook, creator); if (xlf) ServerInstance->XLines->ApplyLines(); @@ -153,7 +153,7 @@ class ModuleClearChan : public Module void init() override { // Only attached while we are working; don't react to events otherwise - ServerInstance->Modules->DetachAll(this); + ServerInstance->Modules.DetachAll(this); } void OnBuildNeighborList(User* source, IncludeChanList& include, std::map& exception) override diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 01bdce2ca..83c190f4c 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -357,7 +357,7 @@ class ModuleCloaking : public Module void Prioritize() override { /* Needs to be after m_banexception etc. */ - ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST); + ServerInstance->Modules.SetPriority(this, I_OnCheckBan, PRIORITY_LAST); } // this unsets umode +x on every host change. If we are actually doing a +x diff --git a/src/modules/m_conn_join.cpp b/src/modules/m_conn_join.cpp index 585d71925..3769e9635 100644 --- a/src/modules/m_conn_join.cpp +++ b/src/modules/m_conn_join.cpp @@ -80,7 +80,7 @@ class ModuleConnJoin : public Module void Prioritize() override { - ServerInstance->Modules->SetPriority(this, I_OnPostConnect, PRIORITY_LAST); + ServerInstance->Modules.SetPriority(this, I_OnPostConnect, PRIORITY_LAST); } Version GetVersion() override diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp index 7e53a7a2f..f18a9e80b 100644 --- a/src/modules/m_conn_umodes.cpp +++ b/src/modules/m_conn_umodes.cpp @@ -28,7 +28,7 @@ class ModuleModesOnConnect : public Module void Prioritize() override { // for things like +x on connect, important, otherwise we have to resort to config order (bleh) -- w00t - ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST); + ServerInstance->Modules.SetPriority(this, I_OnUserConnect, PRIORITY_FIRST); } Version GetVersion() override diff --git a/src/modules/m_customprefix.cpp b/src/modules/m_customprefix.cpp index a092372b2..29e64bbb1 100644 --- a/src/modules/m_customprefix.cpp +++ b/src/modules/m_customprefix.cpp @@ -87,7 +87,7 @@ class ModuleCustomPrefix : public Module { CustomPrefixMode* mh = new CustomPrefixMode(this, name, letter[0], prefix[0], tag); modes.push_back(mh); - ServerInstance->Modules->AddService(*mh); + ServerInstance->Modules.AddService(*mh); } catch (ModuleException& e) { diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp index 2ed428611..29dd834e5 100644 --- a/src/modules/m_globalload.cpp +++ b/src/modules/m_globalload.cpp @@ -41,14 +41,14 @@ class CommandGloadmodule : public Command if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername)) { - if (ServerInstance->Modules->Load(parameters[0].c_str())) + if (ServerInstance->Modules.Load(parameters[0].c_str())) { ServerInstance->SNO->WriteToSnoMask('a', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick.c_str()); user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded."); } else { - user->WriteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules->LastError()); + user->WriteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules.LastError()); } } else @@ -87,17 +87,17 @@ class CommandGunloadmodule : public Command if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername)) { - Module* m = ServerInstance->Modules->Find(parameters[0]); + Module* m = ServerInstance->Modules.Find(parameters[0]); if (m) { - if (ServerInstance->Modules->Unload(m)) + if (ServerInstance->Modules.Unload(m)) { ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str()); user->WriteRemoteNumeric(RPL_UNLOADEDMODULE, parameters[0], "Module successfully unloaded."); } else { - user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], ServerInstance->Modules->LastError()); + user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], ServerInstance->Modules.LastError()); } } else @@ -131,7 +131,7 @@ class CommandGreloadmodule : public Command if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername)) { - Module* m = ServerInstance->Modules->Find(parameters[0]); + Module* m = ServerInstance->Modules.Find(parameters[0]); if (m) { ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY RELOADED BY '%s'", parameters[0].c_str(), user->nick.c_str()); diff --git a/src/modules/m_httpd_stats.cpp b/src/modules/m_httpd_stats.cpp index 61a7aaac6..c67c1ac1b 100644 --- a/src/modules/m_httpd_stats.cpp +++ b/src/modules/m_httpd_stats.cpp @@ -154,7 +154,7 @@ namespace Stats std::ostream& Modules(std::ostream& data) { data << ""; - const ModuleManager::ModuleMap& mods = ServerInstance->Modules->GetModules(); + const ModuleManager::ModuleMap& mods = ServerInstance->Modules.GetModules(); for (ModuleManager::ModuleMap::const_iterator i = mods.begin(); i != mods.end(); ++i) { diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp index 67aef2324..1b31d12da 100644 --- a/src/modules/m_messageflood.cpp +++ b/src/modules/m_messageflood.cpp @@ -160,7 +160,7 @@ class ModuleMsgFlood : public Module void Prioritize() override { // we want to be after all modules that might deny the message (e.g. m_muteban, m_noctcp, m_blockcolor, etc.) - ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST); + ServerInstance->Modules.SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST); } Version GetVersion() override diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp index 570a620cb..c99ff9133 100644 --- a/src/modules/m_namedmodes.cpp +++ b/src/modules/m_namedmodes.cpp @@ -133,7 +133,7 @@ class ModuleNamedModes : public Module void Prioritize() override { - ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST); + ServerInstance->Modules.SetPriority(this, I_OnPreMode, PRIORITY_FIRST); } ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) override diff --git a/src/modules/m_nicklock.cpp b/src/modules/m_nicklock.cpp index f4ea299d3..fd12eb903 100644 --- a/src/modules/m_nicklock.cpp +++ b/src/modules/m_nicklock.cpp @@ -167,8 +167,8 @@ class ModuleNickLock : public Module void Prioritize() override { - Module *nflood = ServerInstance->Modules->Find("m_nickflood.so"); - ServerInstance->Modules->SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, nflood); + Module *nflood = ServerInstance->Modules.Find("m_nickflood.so"); + ServerInstance->Modules.SetPriority(this, I_OnUserPreNick, PRIORITY_BEFORE, nflood); } }; diff --git a/src/modules/m_ojoin.cpp b/src/modules/m_ojoin.cpp index 0da8850d0..2437616de 100644 --- a/src/modules/m_ojoin.cpp +++ b/src/modules/m_ojoin.cpp @@ -152,7 +152,7 @@ class ModuleOjoin : public Module void Prioritize() override { - ServerInstance->Modules->SetPriority(this, I_OnUserPreJoin, PRIORITY_FIRST); + ServerInstance->Modules.SetPriority(this, I_OnUserPreJoin, PRIORITY_FIRST); } Version GetVersion() override diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp index 622c48db9..4ecbc84fb 100644 --- a/src/modules/m_operprefix.cpp +++ b/src/modules/m_operprefix.cpp @@ -107,8 +107,8 @@ class ModuleOperPrefixMode : public Module void Prioritize() override { // m_opermodes may set +H on the oper to hide him, we don't want to set the oper prefix in that case - Module* opermodes = ServerInstance->Modules->Find("m_opermodes.so"); - ServerInstance->Modules->SetPriority(this, I_OnPostOper, PRIORITY_AFTER, opermodes); + Module* opermodes = ServerInstance->Modules.Find("m_opermodes.so"); + ServerInstance->Modules.SetPriority(this, I_OnPostOper, PRIORITY_AFTER, opermodes); } }; diff --git a/src/modules/m_password_hash.cpp b/src/modules/m_password_hash.cpp index 01eb6b256..f0a12019b 100644 --- a/src/modules/m_password_hash.cpp +++ b/src/modules/m_password_hash.cpp @@ -37,7 +37,7 @@ class CommandMkpasswd : public Command if (!parameters[0].compare(0, 5, "hmac-", 5)) { std::string type(parameters[0], 5); - HashProvider* hp = ServerInstance->Modules->FindDataService("hash/" + type); + HashProvider* hp = ServerInstance->Modules.FindDataService("hash/" + type); if (!hp) { user->WriteNotice("Unknown hash type"); @@ -58,7 +58,7 @@ class CommandMkpasswd : public Command return CMD_SUCCESS; } - HashProvider* hp = ServerInstance->Modules->FindDataService("hash/" + parameters[0]); + HashProvider* hp = ServerInstance->Modules.FindDataService("hash/" + parameters[0]); if (!hp) { user->WriteNotice("Unknown hash type"); @@ -87,7 +87,7 @@ class ModulePasswordHash : public Module if (!hashtype.compare(0, 5, "hmac-", 5)) { std::string type(hashtype, 5); - HashProvider* hp = ServerInstance->Modules->FindDataService("hash/" + type); + HashProvider* hp = ServerInstance->Modules.FindDataService("hash/" + type); if (!hp) return MOD_RES_PASSTHRU; @@ -110,7 +110,7 @@ class ModulePasswordHash : public Module return MOD_RES_DENY; } - HashProvider* hp = ServerInstance->Modules->FindDataService("hash/" + hashtype); + HashProvider* hp = ServerInstance->Modules.FindDataService("hash/" + hashtype); /* Is this a valid hash name? */ if (hp) diff --git a/src/modules/m_pbkdf2.cpp b/src/modules/m_pbkdf2.cpp index 3b2c3052a..20c3ddd12 100644 --- a/src/modules/m_pbkdf2.cpp +++ b/src/modules/m_pbkdf2.cpp @@ -231,7 +231,7 @@ class ModulePBKDF2 : public Module if (item->provider != &prov) continue; - ServerInstance->Modules->DelService(*item); + ServerInstance->Modules.DelService(*item); delete item; providers.erase(i); break; diff --git a/src/modules/m_repeat.cpp b/src/modules/m_repeat.cpp index 8e2c62230..0c93075f5 100644 --- a/src/modules/m_repeat.cpp +++ b/src/modules/m_repeat.cpp @@ -407,7 +407,7 @@ class RepeatModule : public Module void Prioritize() override { - ServerInstance->Modules->SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST); + ServerInstance->Modules.SetPriority(this, I_OnUserPreMessage, PRIORITY_LAST); } Version GetVersion() override diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index 248b3ec0d..5151f8ace 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -347,8 +347,8 @@ class ModuleRLine : public Module, public Stats::EventListener void Prioritize() override { - Module* mod = ServerInstance->Modules->Find("m_cgiirc.so"); - ServerInstance->Modules->SetPriority(this, I_OnUserRegister, PRIORITY_AFTER, mod); + Module* mod = ServerInstance->Modules.Find("m_cgiirc.so"); + ServerInstance->Modules.SetPriority(this, I_OnUserRegister, PRIORITY_AFTER, mod); } }; diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp index 37d11de18..4d8c4bf84 100644 --- a/src/modules/m_samode.cpp +++ b/src/modules/m_samode.cpp @@ -124,11 +124,11 @@ class ModuleSaMode : public Module void Prioritize() override { - Module* disable = ServerInstance->Modules->Find("m_disable.so"); - ServerInstance->Modules->SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disable); + Module* disable = ServerInstance->Modules.Find("m_disable.so"); + ServerInstance->Modules.SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disable); - Module *override = ServerInstance->Modules->Find("m_override.so"); - ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override); + Module *override = ServerInstance->Modules.Find("m_override.so"); + ServerInstance->Modules.SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override); } }; diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index e3937dfbc..c235d80c6 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -410,7 +410,7 @@ class ModuleSASL : public Module void init() override { - if (!ServerInstance->Modules->Find("m_services_account.so") || !ServerInstance->Modules->Find("m_cap.so")) + if (!ServerInstance->Modules.Find("m_services_account.so") || !ServerInstance->Modules.Find("m_cap.so")) ServerInstance->Logs.Log(MODNAME, LOG_DEFAULT, "WARNING: m_services_account and m_cap are not loaded! m_sasl will NOT function correctly until these two modules are loaded!"); } diff --git a/src/modules/m_showfile.cpp b/src/modules/m_showfile.cpp index 67bbda390..93b80783b 100644 --- a/src/modules/m_showfile.cpp +++ b/src/modules/m_showfile.cpp @@ -131,7 +131,7 @@ class ModuleShowFile : public Module { // Command doesn't exist, create it sfcmd = new CommandShowFile(this, cmdname); - ServerInstance->Modules->AddService(*sfcmd); + ServerInstance->Modules.AddService(*sfcmd); } sfcmd->UpdateSettings(tag, reader.GetVector()); diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index f3117392f..1e2ee7ff1 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -168,8 +168,8 @@ class ModuleShun : public Module, public Stats::EventListener void Prioritize() override { - Module* alias = ServerInstance->Modules->Find("m_alias.so"); - ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, alias); + Module* alias = ServerInstance->Modules.Find("m_alias.so"); + ServerInstance->Modules.SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, alias); } ModResult OnStats(Stats::Context& stats) override diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 38958f0fb..93e8008a6 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -39,7 +39,7 @@ static CompatMod compatmods[] = std::string TreeSocket::MyModules(int filter) { - const ModuleManager::ModuleMap& modlist = ServerInstance->Modules->GetModules(); + const ModuleManager::ModuleMap& modlist = ServerInstance->Modules.GetModules(); std::string capabilities; for (ModuleManager::ModuleMap::const_iterator i = modlist.begin(); i != modlist.end(); ++i) @@ -170,7 +170,7 @@ void TreeSocket::SendCapabilities(int phase) std::string extra; /* Do we have sha256 available? If so, we send a challenge */ - if (ServerInstance->Modules->FindService(SERVICE_DATA, "hash/sha256")) + if (ServerInstance->Modules.FindService(SERVICE_DATA, "hash/sha256")) { SetOurChallenge(ServerInstance->GenRandomStr(20)); extra = " CHALLENGE=" + this->GetOurChallenge(); @@ -204,7 +204,7 @@ void TreeSocket::SendCapabilities(int phase) // in 2.0, we advertise it here to not break linking to previous versions. // Protocol version 1201 (1.2) does not have this issue because we advertise m_globops // to 1201 protocol servers irrespectively of its module flags. - (ServerInstance->Modules->Find("m_globops.so") != NULL ? " GLOBOPS=1" : " GLOBOPS=0") + (ServerInstance->Modules.Find("m_globops.so") != NULL ? " GLOBOPS=1" : " GLOBOPS=0") ); this->WriteLine("CAPAB END"); @@ -395,7 +395,7 @@ bool TreeSocket::Capab(const CommandBase::Params& params) /* Challenge response, store their challenge for our password */ std::map::iterator n = this->capab->CapKeys.find("CHALLENGE"); - if ((n != this->capab->CapKeys.end()) && (ServerInstance->Modules->FindService(SERVICE_DATA, "hash/sha256"))) + if ((n != this->capab->CapKeys.end()) && (ServerInstance->Modules.FindService(SERVICE_DATA, "hash/sha256"))) { /* Challenge-response is on now */ this->SetTheirChallenge(n->second); diff --git a/src/modules/m_spanningtree/hmac.cpp b/src/modules/m_spanningtree/hmac.cpp index 0343f9611..8fcb47655 100644 --- a/src/modules/m_spanningtree/hmac.cpp +++ b/src/modules/m_spanningtree/hmac.cpp @@ -54,7 +54,7 @@ std::string TreeSocket::MakePass(const std::string &password, const std::string * Note: If an sha256 provider is not available, we MUST fall back to plaintext with no * HMAC challenge/response. */ - HashProvider* sha256 = ServerInstance->Modules->FindDataService("hash/sha256"); + HashProvider* sha256 = ServerInstance->Modules.FindDataService("hash/sha256"); if (sha256 && !challenge.empty()) return "AUTH:" + BinToBase64(sha256->hmac(password, challenge)); diff --git a/src/modules/m_spanningtree/main.cpp b/src/modules/m_spanningtree/main.cpp index a66dad133..600b92b02 100644 --- a/src/modules/m_spanningtree/main.cpp +++ b/src/modules/m_spanningtree/main.cpp @@ -793,7 +793,7 @@ Version ModuleSpanningTree::GetVersion() */ void ModuleSpanningTree::Prioritize() { - ServerInstance->Modules->SetPriority(this, PRIORITY_LAST); + ServerInstance->Modules.SetPriority(this, PRIORITY_LAST); ServerInstance->Modules.SetPriority(this, I_OnPreTopicChange, PRIORITY_FIRST); } diff --git a/src/modules/m_spanningtree/treesocket1.cpp b/src/modules/m_spanningtree/treesocket1.cpp index 118be622b..d98e74410 100644 --- a/src/modules/m_spanningtree/treesocket1.cpp +++ b/src/modules/m_spanningtree/treesocket1.cpp @@ -114,7 +114,7 @@ void TreeSocket::OnConnected() { if (!capab->link->Hook.empty()) { - ServiceProvider* prov = ServerInstance->Modules->FindService(SERVICE_IOHOOK, capab->link->Hook); + ServiceProvider* prov = ServerInstance->Modules.FindService(SERVICE_IOHOOK, capab->link->Hook); if (!prov) { SetError("Could not find hook '" + capab->link->Hook + "' for connection to " + linkID); diff --git a/src/modules/m_sqlauth.cpp b/src/modules/m_sqlauth.cpp index 016a9d918..c3dee7130 100644 --- a/src/modules/m_sqlauth.cpp +++ b/src/modules/m_sqlauth.cpp @@ -57,7 +57,7 @@ class AuthQuery : public SQL::Query { if (!kdf.empty()) { - HashProvider* hashprov = ServerInstance->Modules->FindDataService("hash/" + kdf); + HashProvider* hashprov = ServerInstance->Modules.FindDataService("hash/" + kdf); if (!hashprov) { if (verbose) @@ -185,7 +185,7 @@ class ModuleSQLAuth : public Module for (std::vector::const_iterator it = hash_algos.begin(); it != hash_algos.end(); ++it) { - HashProvider* hashprov = ServerInstance->Modules->FindDataService("hash/" + *it); + HashProvider* hashprov = ServerInstance->Modules.FindDataService("hash/" + *it); if (hashprov && !hashprov->IsKDF()) userinfo[*it + "pass"] = hashprov->Generate(user->password); } -- cgit v1.3.1-10-gc9f91