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

[indirect-sender] change AddMessageForSleepyChild() to return void (#4941)

Browse Source
This commit is contained in:
Jonathan Hui
2020-05-11 12:44:54 -07:00
parent 8172e31a47
commit 1578346dce
3 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/indirect_sender.cpp
+4 -5
View File
@@ -84,15 +84,14 @@ exit:
mEnabled = false;
}
otError IndirectSender::AddMessageForSleepyChild(Message &aMessage, Child &aChild)
void IndirectSender::AddMessageForSleepyChild(Message &aMessage, Child &aChild)
{
otError error = OT_ERROR_NONE;
uint16_t childIndex;
VerifyOrExit(!aChild.IsRxOnWhenIdle(), error = OT_ERROR_INVALID_STATE);
OT_ASSERT(!aChild.IsRxOnWhenIdle());
childIndex = Get<ChildTable>().GetChildIndex(aChild);
VerifyOrExit(!aMessage.GetChildMask(childIndex), error = OT_ERROR_ALREADY);
VerifyOrExit(!aMessage.GetChildMask(childIndex), OT_NOOP);
aMessage.SetChildMask(childIndex);
mSourceMatchController.IncrementMessageCount(aChild);
@@ -100,7 +99,7 @@ otError IndirectSender::AddMessageForSleepyChild(Message &aMessage, Child &aChil
RequestMessageUpdate(aChild);
exit:
return error;
return;
}
otError IndirectSender::RemoveMessageFromSleepyChild(Message &aMessage, Child &aChild)
src/core/thread/indirect_sender.hpp
+1 -5
View File
@@ -152,12 +152,8 @@ public:
* @param[in] aMessage The message to add.
* @param[in] aChild The (sleepy) child for indirect transmission.
*
* @retval OT_ERROR_NONE Successfully added the message for indirect transmission.
* @retval OT_ERROR_ALREADY The message was already added for indirect transmission to same child.
* @retval OT_ERROR_INVALID_STATE The child is not sleepy.
*
*/
otError AddMessageForSleepyChild(Message &aMessage, Child &aChild);
void AddMessageForSleepyChild(Message &aMessage, Child &aChild);
/**
* This method removes a message for indirect transmission to a sleepy child.
src/core/thread/mesh_forwarder_ftd.cpp
+4 -4
View File
@@ -87,7 +87,7 @@ otError MeshForwarder::SendMessage(Message &aMessage)
if (!child.IsRxOnWhenIdle())
{
IgnoreError(mIndirectSender.AddMessageForSleepyChild(aMessage, child));
mIndirectSender.AddMessageForSleepyChild(aMessage, child);
}
}
}
@@ -101,7 +101,7 @@ otError MeshForwarder::SendMessage(Message &aMessage)
if (mle.IsSleepyChildSubscribed(ip6Header.GetDestination(), child))
{
IgnoreError(mIndirectSender.AddMessageForSleepyChild(aMessage, child));
mIndirectSender.AddMessageForSleepyChild(aMessage, child);
}
}
}
@@ -112,7 +112,7 @@ otError MeshForwarder::SendMessage(Message &aMessage)
{
// destined for a sleepy child
Child &child = *static_cast<Child *>(neighbor);
IgnoreError(mIndirectSender.AddMessageForSleepyChild(aMessage, child));
mIndirectSender.AddMessageForSleepyChild(aMessage, child);
}
else
{
@@ -127,7 +127,7 @@ otError MeshForwarder::SendMessage(Message &aMessage)
{
Child *child = Get<Utils::ChildSupervisor>().GetDestination(aMessage);
OT_ASSERT((child != NULL) && !child->IsRxOnWhenIdle());
IgnoreError(mIndirectSender.AddMessageForSleepyChild(aMessage, *child));
mIndirectSender.AddMessageForSleepyChild(aMessage, *child);
break;
}