ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Also build isupport for removed but still in use connect classes.

Browse Source
This commit is contained in:
Sadie Powell 2025-01-23 15:57:40 +00:00
parent b9fee8b43d
commit 8a52f5ece8
2 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/coremods/core_info/core_info.h
View File

@ -28,7 +28,8 @@ class ISupportManager final
{ {
private: private:
/** The generated numerics which are sent to clients. */ /** The generated numerics which are sent to clients. */
typedef insp::flat_map<std::shared_ptr<ConnectClass>, std::vector<Numeric::Numeric>> NumericMap; typedef std::vector<Numeric::Numeric> NumericList;
typedef insp::flat_map<std::shared_ptr<ConnectClass>, NumericList> NumericMap;
NumericMap cachednumerics; NumericMap cachednumerics;
/** The tokens which were generated by the last update. */ /** The tokens which were generated by the last update. */
@ -44,6 +45,9 @@ private:
*/ */
static void AppendValue(std::string& buffer, const std::string& value); static void AppendValue(std::string& buffer, const std::string& value);
// Builds the ISUPPORT tokens for a specific connect class.
void BuildClass(ISupport::TokenMap& newtokens, NumericList& newnumerics, NumericList& diffnumerics, const std::shared_ptr<ConnectClass>& klass);
/** Builds the ISUPPORT numerics from a list of tokens. /** Builds the ISUPPORT numerics from a list of tokens.
* @param tokens The tokens to build from. * @param tokens The tokens to build from.
* @param numerics The location to store the built numeric lists. * @param numerics The location to store the built numeric lists.

64
src/coremods/core_info/isupport.cpp
View File

@ -71,6 +71,25 @@ void ISupportManager::AppendValue(std::string& buffer, const std::string& value)
} }
} }
void ISupportManager::BuildClass(ISupport::TokenMap& newtokens, NumericList& newnumerics,
NumericList& diffnumerics, const std::shared_ptr<ConnectClass> &klass)
{
isupportevprov.Call(&ISupport::EventListener::OnBuildClassISupport, klass, newtokens);
// Transform the map into a list of numerics ready to be sent to clients.
BuildNumerics(newtokens, newnumerics);
// Extract the tokens which have been updated.
auto oldtokens = cachedtokens.find(klass);
if (oldtokens != cachedtokens.end())
{
// Build the updated numeric diff to send to to existing users.
ISupport::TokenMap difftokens;
TokenDifference(difftokens, oldtokens->second, newtokens);
BuildNumerics(difftokens, diffnumerics);
}
}
void ISupportManager::Build() void ISupportManager::Build()
{ {
// Modules can add new tokens and also edit or remove existing tokens. // Modules can add new tokens and also edit or remove existing tokens.
@ -97,40 +116,31 @@ void ISupportManager::Build()
TokenMap newtokens; TokenMap newtokens;
for (const auto& klass : ServerInstance->Config->Classes) for (const auto& klass : ServerInstance->Config->Classes)
{ {
ISupport::TokenMap classtokens = tokens; ServerInstance->Logs.Debug(MODNAME, "Rebuilding isupport for {}", klass->GetName());
isupportevprov.Call(&ISupport::EventListener::OnBuildClassISupport, klass, classtokens); newtokens[klass] = tokens;
BuildClass(newtokens[klass], newnumerics[klass], diffnumerics[klass], klass);
// Transform the map into a list of numerics ready to be sent to clients.
std::vector<Numeric::Numeric> numerics;
BuildNumerics(classtokens, numerics);
// Extract the tokens which have been updated.
auto oldtokens = cachedtokens.find(klass);
if (oldtokens != cachedtokens.end())
{
// Build the updated numeric diff to send to to existing users.
ISupport::TokenMap difftokens;
TokenDifference(difftokens, oldtokens->second, classtokens);
BuildNumerics(difftokens, diffnumerics[klass]);
}
// Store the new ISUPPORT values.
newnumerics[klass] = numerics;
newtokens[klass] = classtokens;
} }
// Apply the new ISUPPORT values. // Send out the numeric diffs.
cachednumerics.swap(newnumerics);
cachedtokens.swap(newtokens);
if (!diffnumerics.empty()) if (!diffnumerics.empty())
{ {
for (LocalUser* user : ServerInstance->Users.GetLocalUsers()) for (LocalUser* user : ServerInstance->Users.GetLocalUsers())
{ {
const auto& klass = user->GetClass();
if (!(user->connected & User::CONN_FULL)) if (!(user->connected & User::CONN_FULL))
continue; // User hasn't received 005 yet. continue; // User hasn't received 005 yet.
auto numerics = diffnumerics.find(user->GetClass()); auto numerics = diffnumerics.find(klass);
if (numerics == diffnumerics.end())
{
// The user is in a class which has been removed from the server
// config; we need to build a class for them.
ServerInstance->Logs.Debug(MODNAME, "Rebuilding isupport for {} (dead)", klass->GetName());
newtokens[klass] = tokens;
BuildClass(newtokens[klass], newnumerics[klass], diffnumerics[klass], klass);
numerics = diffnumerics.find(klass);
}
if (numerics == diffnumerics.end()) if (numerics == diffnumerics.end())
continue; // Should never happen. continue; // Should never happen.
@ -138,6 +148,10 @@ void ISupportManager::Build()
user->WriteNumeric(numeric); user->WriteNumeric(numeric);
} }
} }
// Apply the new ISUPPORT values.
cachednumerics.swap(newnumerics);
cachedtokens.swap(newtokens);
} }
void ISupportManager::BuildNumerics(ISupport::TokenMap& tokens, std::vector<Numeric::Numeric>& numerics) void ISupportManager::BuildNumerics(ISupport::TokenMap& tokens, std::vector<Numeric::Numeric>& numerics)