From 9990efb09eaf6d361376cfde146290bb2dad1363 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Sun, 20 Jul 2025 16:36:21 +0100 Subject: Move spanningtree configuration to its own tag. This reduces the size of the core configuration file and also centralises all of the spanningtree configuration to one place. --- modules/spanningtree/utils.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'modules/spanningtree/utils.cpp') diff --git a/modules/spanningtree/utils.cpp b/modules/spanningtree/utils.cpp index 45ea78c79..db42a7571 100644 --- a/modules/spanningtree/utils.cpp +++ b/modules/spanningtree/utils.cpp @@ -238,19 +238,21 @@ void SpanningTreeUtilities::RefreshIPCache() void SpanningTreeUtilities::ReadConfiguration() { + const auto& mtag = ServerInstance->Config->ConfValue("spanningtree"); + const auto& options = ServerInstance->Config->ConfValue("options"); - AllowOptCommon = options->getBool("allowmismatch"); - AnnounceTSChange = options->getBool("announcets"); - PingWarnTime = options->getDuration("pingwarning", 15); - PingFreq = options->getDuration("serverpingfreq", 60, 1); + AllowOptCommon = mtag->getBool("allowmismatch", options->getBool("allowmismatch")); + AnnounceTSChange = mtag->getBool("announcets", options->getBool("announcets")); + PingWarnTime = mtag->getDuration("pingwarning", options->getDuration("pingwarning", 15)); + PingFreq = mtag->getDuration("pingfreq", options->getDuration("serverpingfreq", 60, 1), 60, 1); const auto& security = ServerInstance->Config->ConfValue("security"); - FlatLinks = security->getBool("flatlinks"); - HideServices = security->getBool("hideservices"); - HideSplits = security->getBool("hidesplits"); + FlatLinks = mtag->getBool("flatlinks", security->getBool("flatlinks")); + HideServices = mtag->getBool("hideservices", security->getBool("hideservices")); + HideSplits = mtag->getBool("hidesplits", security->getBool("hidesplits")); const auto& performance = ServerInstance->Config->ConfValue("performance"); - quiet_bursts = performance->getBool("quietbursts"); + quiet_bursts = mtag->getBool("quietbursts", performance->getBool("quietbursts", true)); if (PingWarnTime >= PingFreq) PingWarnTime = 0; -- cgit v1.3.1-10-gc9f91