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

[mesh-forwarder] clear child's indirect message pointer when message is removed (#2269)

Browse Source 
This commit changes/fixes the `MeshForwarder::RemoveMessages()` to
check if the message being removed is the current indirect message
stored in child entry and if so, we ensure to clear the pointer in the
entry. It also adds a new private method in `MeshForwarder` called
`RemoveMessageFromSleepyChild()` to refactor the common code used in
both `RemoveMessage()` and `RemoveMessages()`.
This commit is contained in:
Abtin Keshavarzian
2017-10-18 13:30:24 -07:00
committed by Jonathan Hui
parent 5bc2b8113b
commit 6c79f6651f
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/mesh_forwarder.cpp
+21 -20
View File
@@ -255,6 +255,25 @@ exit:
return error;
}
otError MeshForwarder::RemoveMessageFromSleepyChild(Message &aMessage, Child &aChild)
{
otError error = OT_ERROR_NONE;
uint8_t childIndex = GetNetif().GetMle().GetChildIndex(aChild);
VerifyOrExit(aMessage.GetChildMask(childIndex) == true, error = OT_ERROR_NOT_FOUND);
aMessage.ClearChildMask(childIndex);
mSourceMatchController.DecrementMessageCount(aChild);
if (aChild.GetIndirectMessage() == &aMessage)
{
aChild.SetIndirectMessage(NULL);
}
exit:
return error;
}
void MeshForwarder::RemoveMessage(Message &aMessage)
{
Child *children;
@@ -264,16 +283,7 @@ void MeshForwarder::RemoveMessage(Message &aMessage)
for (uint8_t i = 0; i < numChildren; i++)
{
if (aMessage.GetChildMask(i))
{
aMessage.ClearChildMask(i);
mSourceMatchController.DecrementMessageCount(children[i]);
if (children[i].GetIndirectMessage() == &aMessage)
{
children[i].SetIndirectMessage(NULL);
}
}
IgnoreReturnValue(RemoveMessageFromSleepyChild(aMessage, children[i]));
}
if (mSendMessage == &aMessage)
@@ -293,8 +303,6 @@ void MeshForwarder::RemoveMessages(Child &aChild, uint8_t aSubType)
for (Message *message = mSendQueue.GetHead(); message; message = nextMessage)
{
uint8_t childIndex = netif.GetMle().GetChildIndex(aChild);
nextMessage = message->GetNext();
if ((aSubType != Message::kSubTypeNone) && (aSubType != message->GetSubType()))
@@ -302,12 +310,7 @@ void MeshForwarder::RemoveMessages(Child &aChild, uint8_t aSubType)
continue;
}
if (message->GetChildMask(childIndex))
{
message->ClearChildMask(childIndex);
mSourceMatchController.DecrementMessageCount(aChild);
}
else
if (RemoveMessageFromSleepyChild(*message, aChild) != OT_ERROR_NONE)
{
switch (message->GetType())
{
@@ -340,10 +343,8 @@ void MeshForwarder::RemoveMessages(Child &aChild, uint8_t aSubType)
}
default:
{
break;
}
}
}
if (!message->IsChildPending() && !message->GetDirectTransmission())
src/core/thread/mesh_forwarder.hpp
+1
View File
@@ -293,6 +293,7 @@ private:
otError HandleDatagram(Message &aMessage, const otThreadLinkInfo &aLinkInfo,
const Mac::Address &aMacSource);
void ClearReassemblyList(void);
otError RemoveMessageFromSleepyChild(Message &aMessage, Child &aChild);
void RemoveMessage(Message &aMessage);
static void HandleReceivedFrame(Mac::Receiver &aReceiver, Mac::Frame &aFrame);