From 69dd33699f68763a11441e42d86eff51942ae093 Mon Sep 17 00:00:00 2001
From: Abtin Keshavarzian <abtink@google.com>
Date: Tue, 5 May 2026 07:50:10 -0700
Subject: [PATCH] [mlr] simplify `SendMlrMessage()` arguments (#13043)

This commit simplifies the `MlrManager::SendMlrMessage()` method by
removing the `void *aContext` parameter.

Previously, all callers (`SendMlr()` and `RegisterMulticastListeners()`)
were passing `this` as the context for the CoAP response handler. The
context is now passed directly as `this` when invoking
`Tmf::Agent::SendMessageTo()`, removing the need to thread it through
the method arguments.
---
 src/core/thread/mlr_manager.cpp | 11 +++++------
 src/core/thread/mlr_manager.hpp |  3 +--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/core/thread/mlr_manager.cpp b/src/core/thread/mlr_manager.cpp
index 89d2076ff..2fa285312 100644
--- a/src/core/thread/mlr_manager.cpp
+++ b/src/core/thread/mlr_manager.cpp
@@ -272,8 +272,8 @@ void MlrManager::SendMlr(void)
 #endif
 
     VerifyOrExit(!addresses.IsEmpty(), error = kErrorNotFound);
-    SuccessOrExit(
-        error = SendMlrMessage(addresses.GetArrayBuffer(), addresses.GetLength(), nullptr, HandleMlrResponse, this));
+    SuccessOrExit(error =
+                      SendMlrMessage(addresses.GetArrayBuffer(), addresses.GetLength(), nullptr, HandleMlrResponse));
 
     mMlrPending = true;
 
@@ -324,7 +324,7 @@ Error MlrManager::RegisterMulticastListeners(const Ip6::Address *aAddresses,
     // Only allow one outstanding registration if callback is specified.
     VerifyOrExit(!mRegisterPending, error = kErrorBusy);
 
-    SuccessOrExit(error = SendMlrMessage(aAddresses, aAddressNum, aTimeout, HandleRegisterResponse, this));
+    SuccessOrExit(error = SendMlrMessage(aAddresses, aAddressNum, aTimeout, HandleRegisterResponse));
 
     mRegisterPending = true;
     mRegisterCallback.Set(aCallback, aContext);
@@ -351,8 +351,7 @@ void MlrManager::HandleRegisterResponse(Coap::Msg *aMsg, Error aResult)
 Error MlrManager::SendMlrMessage(const Ip6::Address         *aAddresses,
                                  uint8_t                     aAddressNum,
                                  const uint32_t             *aTimeout,
-                                 const Coap::ResponseHandler aResponseHandler,
-                                 void                       *aContext)
+                                 const Coap::ResponseHandler aResponseHandler)
 {
     OT_UNUSED_VARIABLE(aTimeout);
 
@@ -397,7 +396,7 @@ Error MlrManager::SendMlrMessage(const Ip6::Address         *aAddresses,
         destAddr.SetToRoutingLocator(Get<Mle::Mle>().GetMeshLocalPrefix(), Get<BackboneRouter::Leader>().GetServer16());
     }
 
-    error = Get<Tmf::Agent>().SendMessageTo(*message, destAddr, aResponseHandler, aContext);
+    error = Get<Tmf::Agent>().SendMessageTo(*message, destAddr, aResponseHandler, this);
 
     LogInfo("Sent MLR.req: addressNum=%d", aAddressNum);
 
diff --git a/src/core/thread/mlr_manager.hpp b/src/core/thread/mlr_manager.hpp
index f7989da5a..74a20a71b 100644
--- a/src/core/thread/mlr_manager.hpp
+++ b/src/core/thread/mlr_manager.hpp
@@ -155,8 +155,7 @@ private:
     Error SendMlrMessage(const Ip6::Address   *aAddresses,
                          uint8_t               aAddressNum,
                          const uint32_t       *aTimeout,
-                         Coap::ResponseHandler aResponseHandler,
-                         void                 *aContext);
+                         Coap::ResponseHandler aResponseHandler);
 
     DeclareTmfResponseHandlerIn(MlrManager, HandleMlrResponse);