From 3eb48ca00c425d62a866e894f40579cf5160235a Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Thu, 1 Jun 2023 13:05:06 -0700 Subject: [PATCH] [backbone-router] use `Clamp` to check MLR timeout value (#9119) --- src/core/backbone_router/bbr_leader.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/core/backbone_router/bbr_leader.cpp b/src/core/backbone_router/bbr_leader.cpp index 30330dee7..a81e32f9f 100644 --- a/src/core/backbone_router/bbr_leader.cpp +++ b/src/core/backbone_router/bbr_leader.cpp @@ -152,9 +152,8 @@ void Leader::Update(void) void Leader::UpdateBackboneRouterPrimary(void) { - Config config; - State state; - uint32_t origMlrTimeout; + Config config; + State state; Get().GetBackboneRouterPrimary(config); @@ -195,17 +194,13 @@ void Leader::UpdateBackboneRouterPrimary(void) // Restrain the range of MLR timeout to be always valid if (config.mServer16 != Mac::kShortAddrInvalid) { - origMlrTimeout = config.mMlrTimeout; - config.mMlrTimeout = config.mMlrTimeout < static_cast(Mle::kMlrTimeoutMin) - ? static_cast(Mle::kMlrTimeoutMin) - : config.mMlrTimeout; - config.mMlrTimeout = config.mMlrTimeout > static_cast(Mle::kMlrTimeoutMax) - ? static_cast(Mle::kMlrTimeoutMax) - : config.mMlrTimeout; + uint32_t origTimeout = config.mMlrTimeout; - if (config.mMlrTimeout != origMlrTimeout) + config.mMlrTimeout = Clamp(config.mMlrTimeout, Mle::kMlrTimeoutMin, Mle::kMlrTimeoutMax); + + if (config.mMlrTimeout != origTimeout) { - LogNote("Leader MLR Timeout is normalized from %lu to %lu", ToUlong(origMlrTimeout), + LogNote("Leader MLR Timeout is normalized from %lu to %lu", ToUlong(origTimeout), ToUlong(config.mMlrTimeout)); } }