From 324f27dd445e50f3009e517465c8452a56d7941d Mon Sep 17 00:00:00 2001 From: Abtin Keshavarzian Date: Fri, 7 Nov 2025 10:33:28 -0800 Subject: [PATCH] [border-agent] rename callback to `HandleLeaderResponseToFwdTmf` (#12119) The `HandleCoapResponse` callback in `CoapDtlsSession` is renamed to `HandleLeaderResponseToFwdTmf`. The new name more clearly indicates that this callback is used to handle the response from the leader for a forwarded TMF message. This improves code readability and makes the role of the callback more explicit. --- src/core/meshcop/border_agent.cpp | 26 +++++++++++++------------- src/core/meshcop/border_agent.hpp | 12 +++++++----- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/core/meshcop/border_agent.cpp b/src/core/meshcop/border_agent.cpp index 1eec2a5ca..daa2e58ee 100644 --- a/src/core/meshcop/border_agent.cpp +++ b/src/core/meshcop/border_agent.cpp @@ -950,7 +950,7 @@ void Manager::CoapDtlsSession::Cleanup(void) { ForwardContext *forwardContext = mForwardContexts.Pop(); - IgnoreError(Get().AbortTransaction(HandleCoapResponse, forwardContext)); + IgnoreError(Get().AbortTransaction(HandleLeaderResponseToFwdTmf, forwardContext)); } mTimer.Stop(); @@ -1076,13 +1076,13 @@ Error Manager::CoapDtlsSession::ForwardToLeader(const Coap::Message &aMessage messageInfo.SetSockPortToTmf(); // On success the message ownership is transferred. - SuccessOrExit(error = - Get().SendMessage(*message, messageInfo, HandleCoapResponse, forwardContext.Get())); + SuccessOrExit(error = Get().SendMessage(*message, messageInfo, HandleLeaderResponseToFwdTmf, + forwardContext.Get())); message.Release(); // Release the ownership of `forwardContext` since `SendMessage()` - // will own it. We take back ownership from `HandleCoapResponse()` - // callback. + // will own it. We take back ownership when the callback + // `HandleLeaderResponseToFwdTmf()` is invoked. mForwardContexts.Push(*forwardContext.Release()); @@ -1099,21 +1099,21 @@ exit: return error; } -void Manager::CoapDtlsSession::HandleCoapResponse(void *aContext, - otMessage *aMessage, - const otMessageInfo *aMessageInfo, - otError aResult) +void Manager::CoapDtlsSession::HandleLeaderResponseToFwdTmf(void *aContext, + otMessage *aMessage, + const otMessageInfo *aMessageInfo, + otError aResult) { OT_UNUSED_VARIABLE(aMessageInfo); OwnedPtr forwardContext(static_cast(aContext)); - forwardContext->mSession.HandleCoapResponse(*forwardContext.Get(), AsCoapMessagePtr(aMessage), aResult); + forwardContext->mSession.HandleLeaderResponseToFwdTmf(*forwardContext.Get(), AsCoapMessagePtr(aMessage), aResult); } -void Manager::CoapDtlsSession::HandleCoapResponse(const ForwardContext &aForwardContext, - const Coap::Message *aResponse, - Error aResult) +void Manager::CoapDtlsSession::HandleLeaderResponseToFwdTmf(const ForwardContext &aForwardContext, + const Coap::Message *aResponse, + Error aResult) { OwnedPtr forwardMessage; Error error; diff --git a/src/core/meshcop/border_agent.hpp b/src/core/meshcop/border_agent.hpp index 59997af08..adce91d75 100644 --- a/src/core/meshcop/border_agent.hpp +++ b/src/core/meshcop/border_agent.hpp @@ -331,11 +331,13 @@ private: static void HandleConnected(ConnectEvent aEvent, void *aContext); void HandleConnected(ConnectEvent aEvent); - static void HandleCoapResponse(void *aContext, - otMessage *aMessage, - const otMessageInfo *aMessageInfo, - otError aResult); - void HandleCoapResponse(const ForwardContext &aForwardContext, const Coap::Message *aResponse, Error aResult); + static void HandleLeaderResponseToFwdTmf(void *aContext, + otMessage *aMessage, + const otMessageInfo *aMessageInfo, + otError aResult); + void HandleLeaderResponseToFwdTmf(const ForwardContext &aForwardContext, + const Coap::Message *aResponse, + Error aResult); static bool HandleUdpReceive(void *aContext, const otMessage *aMessage, const otMessageInfo *aMessageInfo); bool HandleUdpReceive(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo); static bool HandleResource(CoapBase &aCoapBase,