mirror of
https://github.com/espressif/openthread.git
synced 2026-06-06 05:24:51 +00:00
[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.
This commit is contained in:
committed by
GitHub
parent
40ebd8d07f
commit
69dd33699f
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user