From 5590771eb84af03272a91128f8a42771384dd662 Mon Sep 17 00:00:00 2001 From: Jonathan Hui Date: Fri, 8 May 2020 17:43:51 -0700 Subject: [PATCH] [coap] change SendCopy() to return void (#4941) --- src/core/coap/coap.cpp | 15 +++++++++------ src/core/coap/coap.hpp | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/core/coap/coap.cpp b/src/core/coap/coap.cpp index 23cd6f2e7..530b4ad72 100644 --- a/src/core/coap/coap.cpp +++ b/src/core/coap/coap.cpp @@ -375,7 +375,7 @@ void CoapBase::HandleRetransmissionTimer(void) messageInfo.SetPeerPort(metadata.mDestinationPort); messageInfo.SetSockAddr(metadata.mSourceAddress); - IgnoreError(SendCopy(*message, messageInfo)); + SendCopy(*message, messageInfo); } } @@ -465,7 +465,7 @@ void CoapBase::DequeueMessage(Message &aMessage) // the timer would just shoot earlier and then it'd be setup again. } -otError CoapBase::SendCopy(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo) +void CoapBase::SendCopy(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo) { otError error; Message *messageCopy = NULL; @@ -478,12 +478,15 @@ otError CoapBase::SendCopy(const Message &aMessage, const Ip6::MessageInfo &aMes exit: - if (error != OT_ERROR_NONE && messageCopy != NULL) + if (error != OT_ERROR_NONE) { - messageCopy->Free(); - } + otLogWarnCoap("Failed to send copy: %s", otThreadErrorToString(error)); - return error; + if (messageCopy != NULL) + { + messageCopy->Free(); + } + } } Message *CoapBase::FindRelatedRequest(const Message & aResponse, diff --git a/src/core/coap/coap.hpp b/src/core/coap/coap.hpp index 2de7cd959..10bdf27fa 100644 --- a/src/core/coap/coap.hpp +++ b/src/core/coap/coap.hpp @@ -561,7 +561,7 @@ private: void ProcessReceivedRequest(Message &aMessage, const Ip6::MessageInfo &aMessageInfo); void ProcessReceivedResponse(Message &aMessage, const Ip6::MessageInfo &aMessageInfo); - otError SendCopy(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo); + void SendCopy(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo); otError SendEmptyMessage(Message::Type aType, const Message &aRequest, const Ip6::MessageInfo &aMessageInfo); otError Send(ot::Message &aMessage, const Ip6::MessageInfo &aMessageInfo);