espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-17 07:59:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

[commissioning] improve handling of OT_ERROR_NO_BUFS (#2054)

Browse Source 
This commit makes the following changes:

1. Check return value of SetLength() when forming a RLY_TX.ntf message.

2. When accepting data to transmit from mbedtls, only free the message
   buffer if the message buffer is empty.  Otherwise, attempt to transmit
   the message buffer that was already formed.

3. When freeing the transmit message buffer for mbedtls, set the transmit
   message buffer pointer to NULL.
This commit is contained in:
Jonathan Hui
2017-08-03 10:19:50 -07:00
committed by GitHub
parent 818998e609
commit 2f3cfe1c4c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/coap/coap_secure.cpp
+4 -3
View File
@@ -252,21 +252,22 @@ otError CoapSecure::HandleDtlsSend(const uint8_t *aBuf, uint16_t aLength, uint8_
mTransmitMessage->SetLinkSecurityEnabled(false);
}
SuccessOrExit(error = mTransmitMessage->Append(aBuf, aLength));
// Set message sub type in case Joiner Finalize Response is appended to the message.
if (aMessageSubType != Message::kSubTypeNone)
{
mTransmitMessage->SetSubType(aMessageSubType);
}
VerifyOrExit(mTransmitMessage->Append(aBuf, aLength) == OT_ERROR_NONE, error = OT_ERROR_NO_BUFS);
mTransmitTask.Post();
exit:
if (error != OT_ERROR_NONE && mTransmitMessage != NULL)
if (error != OT_ERROR_NONE && mTransmitMessage != NULL && mTransmitMessage->GetLength() == 0)
{
mTransmitMessage->Free();
mTransmitMessage = NULL;
}
otLogFuncExitErr(error);
src/core/meshcop/commissioner.cpp
+1 -1
View File
@@ -1025,7 +1025,7 @@ otError Commissioner::SendRelayTransmit(Message &aMessage, const Ip6::MessageInf
tlv.SetLength(aMessage.GetLength());
SuccessOrExit(error = message->Append(&tlv, sizeof(tlv)));
offset = message->GetLength();
message->SetLength(offset + aMessage.GetLength());
SuccessOrExit(error = message->SetLength(offset + aMessage.GetLength()));
aMessage.CopyTo(0, offset, aMessage.GetLength(), *message);
messageInfo.SetPeerAddr(netif.GetMle().GetMeshLocal16());