espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-02 00:57:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[sntp-client] change SendCopy() to return void (#4941)

Browse Source
This commit is contained in:
Jonathan Hui
2020-05-11 12:44:54 -07:00
parent 20ed51796d
commit 5b8b36ab11
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/sntp_client.cpp
+9 -6
View File
@@ -229,7 +229,7 @@ otError Client::SendMessage(Message &aMessage, const Ip6::MessageInfo &aMessageI
return mSocket.SendTo(aMessage, aMessageInfo);
}
otError Client::SendCopy(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo)
void Client::SendCopy(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo)
{
otError error;
Message *messageCopy = NULL;
@@ -243,12 +243,15 @@ otError Client::SendCopy(const Message &aMessage, const Ip6::MessageInfo &aMessa
exit:
if (error != OT_ERROR_NONE && messageCopy != NULL)
if (error != OT_ERROR_NONE)
{
messageCopy->Free();
}
otLogWarnIp6("Failed to send SNTP request: %s", otThreadErrorToString(error));
return error;
if (messageCopy != NULL)
{
messageCopy->Free();
}
}
}
Message *Client::FindRelatedQuery(const Header &aResponseHeader, QueryMetadata &aQueryMetadata)
@@ -325,7 +328,7 @@ void Client::HandleRetransmissionTimer(void)
messageInfo.SetPeerPort(queryMetadata.mDestinationPort);
messageInfo.SetSockAddr(queryMetadata.mSourceAddress);
IgnoreError(SendCopy(*message, messageInfo));
SendCopy(*message, messageInfo);
}
if (nextTime > queryMetadata.mTransmissionTime)
src/core/net/sntp_client.hpp
+1 -1
View File
@@ -572,7 +572,7 @@ private:
Message *CopyAndEnqueueMessage(const Message &aMessage, const QueryMetadata &aQueryMetadata);
void DequeueMessage(Message &aMessage);
otError SendMessage(Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
otError SendCopy(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
void SendCopy(const Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
Message *FindRelatedQuery(const Header &aResponseHeader, QueryMetadata &aQueryMetadata);
void FinalizeSntpTransaction(Message &aQuery, const QueryMetadata &aQueryMetadata, uint64_t aTime, otError aResult);