From 68e1b2393269a6aa4bec67c7d00bb82003e4d145 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 6 Jul 2023 22:49:43 +0100 Subject: Tidy up spanningtree config reading. --- src/modules/m_spanningtree/utils.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/modules/m_spanningtree/utils.cpp') diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp index 6e6112e25..b3ac34212 100644 --- a/src/modules/m_spanningtree/utils.cpp +++ b/src/modules/m_spanningtree/utils.cpp @@ -233,17 +233,20 @@ void SpanningTreeUtilities::RefreshIPCache() void SpanningTreeUtilities::ReadConfiguration() { - const auto& security = ServerInstance->Config->ConfValue("security"); const auto& options = ServerInstance->Config->ConfValue("options"); - FlatLinks = security->getBool("flatlinks"); - HideServices = security->getBool("hideservices", security->getBool("hideulines")); - HideSplits = security->getBool("hidesplits"); - AnnounceTSChange = options->getBool("announcets"); AllowOptCommon = options->getBool("allowmismatch"); - quiet_bursts = ServerInstance->Config->ConfValue("performance")->getBool("quietbursts"); + AnnounceTSChange = options->getBool("announcets"); PingWarnTime = options->getDuration("pingwarning", 15); PingFreq = options->getDuration("serverpingfreq", 60, 1); + const auto& security = ServerInstance->Config->ConfValue("security"); + FlatLinks = security->getBool("flatlinks"); + HideServices = security->getBool("hideservices", security->getBool("hideulines")); + HideSplits = security->getBool("hidesplits"); + + const auto& performance = ServerInstance->Config->ConfValue("performance"); + quiet_bursts = performance->getBool("quietbursts"); + if (PingWarnTime >= PingFreq) PingWarnTime = 0; -- cgit v1.3.1-10-gc9f91