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

[mesh-forwarder] fix incorrect cast to uint8_t when setting frame length (#4456)

Browse Source
This commit is contained in:
Abtin Keshavarzian
2020-01-08 08:41:59 -08:00
committed by Jonathan Hui
parent f976db5c4c
commit b87545f0c8
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mac/mac_frame.cpp
+1 -1
View File
@@ -913,7 +913,7 @@ otError Frame::AppendHeaderIe(HeaderIe *aIeList, uint8_t aIeCount)
cur += aIeList[i].GetLength();
}
SetPsduLength(GetPsduLength() + static_cast<uint8_t>(cur - base));
SetPsduLength(GetPsduLength() + static_cast<uint16_t>(cur - base));
exit:
return error;
src/core/thread/mesh_forwarder.cpp
+2 -2
View File
@@ -796,7 +796,7 @@ start:
// copy IPv6 Payload
aMessage.Read(aMessage.GetOffset(), payloadLength, payload);
aFrame.SetPayloadLength(static_cast<uint8_t>(headerLength + payloadLength));
aFrame.SetPayloadLength(headerLength + payloadLength);
nextOffset = aMessage.GetOffset() + payloadLength;
aMessage.SetOffset(0);
@@ -826,7 +826,7 @@ start:
// Copy IPv6 Payload
aMessage.Read(aMessage.GetOffset(), payloadLength, payload);
aFrame.SetPayloadLength(static_cast<uint8_t>(headerLength + payloadLength));
aFrame.SetPayloadLength(headerLength + payloadLength);
nextOffset = aMessage.GetOffset() + payloadLength;
}
src/core/thread/mesh_forwarder_ftd.cpp
+1 -1
View File
@@ -330,7 +330,7 @@ void MeshForwarder::SendMesh(Message &aMessage, Mac::TxFrame &aFrame)
// write payload
assert(aMessage.GetLength() <= aFrame.GetMaxPayloadLength());
aMessage.Read(0, aMessage.GetLength(), aFrame.GetPayload());
aFrame.SetPayloadLength(static_cast<uint8_t>(aMessage.GetLength()));
aFrame.SetPayloadLength(aMessage.GetLength());
mMessageNextOffset = aMessage.GetLength();
}