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

[lowpan] do not try to compress large extension headers (#4724)

Browse Source
This commit is contained in:
Jonathan Hui
2020-03-24 11:09:20 -07:00
parent cb55c530bd
commit 2b11826fbe
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/lowpan.cpp
+8 -6
View File
@@ -475,10 +475,8 @@ otError Lowpan::CompressExtensionHeader(Message &aMessage, BufferWriter &aBuf, u
BufferWriter buf = aBuf;
uint16_t startOffset = aMessage.GetOffset();
Ip6::ExtensionHeader extHeader;
Ip6::OptionHeader optionHeader;
uint8_t len;
uint16_t len;
uint8_t padLength = 0;
uint16_t offset;
uint8_t tmpByte;
VerifyOrExit(aMessage.Read(aMessage.GetOffset(), sizeof(extHeader), &extHeader) == sizeof(extHeader),
@@ -504,13 +502,17 @@ otError Lowpan::CompressExtensionHeader(Message &aMessage, BufferWriter &aBuf, u
len = (extHeader.GetLength() + 1) * 8 - sizeof(extHeader);
// RFC 6282 does not support compressing large extension headers
VerifyOrExit(len <= kExtHdrMaxLength, error = OT_ERROR_FAILED);
// RFC 6282 says: "IPv6 Hop-by-Hop and Destination Options Headers may use a trailing
// Pad1 or PadN to achieve 8-octet alignment. When there is a single trailing Pad1 or PadN
// option of 7 octets or less and the containing header is a multiple of 8 octets, the trailing
// Pad1 or PadN option MAY be elided by the compressor."
if (aNextHeader == Ip6::kProtoHopOpts || aNextHeader == Ip6::kProtoDstOpts)
{
offset = aMessage.GetOffset();
uint16_t offset = aMessage.GetOffset();
Ip6::OptionHeader optionHeader;
while (offset < len + aMessage.GetOffset())
{
@@ -544,8 +546,8 @@ otError Lowpan::CompressExtensionHeader(Message &aMessage, BufferWriter &aBuf, u
aNextHeader = static_cast<uint8_t>(extHeader.GetNextHeader());
SuccessOrExit(error = buf.Write(len));
SuccessOrExit(error = buf.Write(aMessage, len));
SuccessOrExit(error = buf.Write(static_cast<uint8_t>(len)));
SuccessOrExit(error = buf.Write(aMessage, static_cast<uint8_t>(len)));
aMessage.MoveOffset(len + padLength);
exit:
src/core/thread/lowpan.hpp
+1
View File
@@ -353,6 +353,7 @@ private:
kExtHdrEidMask = 0x0e,
kExtHdrNextHeader = 0x01,
kExtHdrMaxLength = 255,
kUdpDispatch = 0xf0,
kUdpDispatchMask = 0xf8,