espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-10-10 09:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up handling of message allocation error. (#628)

Browse Source
This commit is contained in:
Jonathan Hui
2016-09-19 12:41:27 -07:00
committed by GitHub
parent 9a2beff1e9
commit 78b2d7d13e
1 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/thread/lowpan.cpp
+8 -22
View File
@@ -750,11 +750,11 @@ exit:
int Lowpan::DecompressExtensionHeader(Message &aMessage, const uint8_t *aBuf, uint16_t aBufLength) int Lowpan::DecompressExtensionHeader(Message &aMessage, const uint8_t *aBuf, uint16_t aBufLength)
{ {
ThreadError error = kThreadError_None;
const uint8_t *cur = aBuf; const uint8_t *cur = aBuf;
uint8_t hdr[2]; uint8_t hdr[2];
uint8_t len; uint8_t len;
Ip6::IpProto nextHeader; Ip6::IpProto nextHeader;
int rval = -1;
uint8_t ctl = cur[0]; uint8_t ctl = cur[0];
cur++; cur++;
@@ -765,7 +765,7 @@ int Lowpan::DecompressExtensionHeader(Message &aMessage, const uint8_t *aBuf, ui
len = cur[0]; len = cur[0];
cur++; cur++;
SuccessOrExit(DispatchToNextHeader(cur[len], nextHeader)); SuccessOrExit(error = DispatchToNextHeader(cur[len], nextHeader));
hdr[0] = static_cast<uint8_t>(nextHeader); hdr[0] = static_cast<uint8_t>(nextHeader);
} }
else else
@@ -780,19 +780,17 @@ int Lowpan::DecompressExtensionHeader(Message &aMessage, const uint8_t *aBuf, ui
// length // length
hdr[1] = BitVectorBytes(sizeof(hdr) + len) - 1; hdr[1] = BitVectorBytes(sizeof(hdr) + len) - 1;
SuccessOrExit(aMessage.Append(hdr, sizeof(hdr))); SuccessOrExit(error = aMessage.Append(hdr, sizeof(hdr)));
aMessage.MoveOffset(sizeof(hdr)); aMessage.MoveOffset(sizeof(hdr));
// payload // payload
SuccessOrExit(aMessage.Append(cur, len)); SuccessOrExit(error = aMessage.Append(cur, len));
aMessage.MoveOffset(len); aMessage.MoveOffset(len);
cur += len; cur += len;
rval = static_cast<int>(cur - aBuf);
exit: exit:
(void)aBufLength; (void)aBufLength;
return rval; return (error == kThreadError_None) ? static_cast<int>(cur - aBuf) : -1;
} }
int Lowpan::DecompressUdpHeader(Message &aMessage, const uint8_t *aBuf, uint16_t aBufLength, uint16_t aDatagramLength) int Lowpan::DecompressUdpHeader(Message &aMessage, const uint8_t *aBuf, uint16_t aBufLength, uint16_t aDatagramLength)
@@ -855,17 +853,11 @@ int Lowpan::DecompressUdpHeader(Message &aMessage, const uint8_t *aBuf, uint16_t
udpHeader.SetLength(aDatagramLength - aMessage.GetOffset()); udpHeader.SetLength(aDatagramLength - aMessage.GetOffset());
} }
aMessage.Append(&udpHeader, sizeof(udpHeader)); SuccessOrExit(error = aMessage.Append(&udpHeader, sizeof(udpHeader)));
aMessage.MoveOffset(sizeof(udpHeader)); aMessage.MoveOffset(sizeof(udpHeader));
exit: exit:
return (error == kThreadError_None) ? static_cast<int>(cur - aBuf) : -1;
if (error != kThreadError_None)
{
return -1;
}
return static_cast<int>(cur - aBuf);
} }
int Lowpan::Decompress(Message &aMessage, const Mac::Address &aMacSource, const Mac::Address &aMacDest, int Lowpan::Decompress(Message &aMessage, const Mac::Address &aMacSource, const Mac::Address &aMacDest,
@@ -911,13 +903,7 @@ int Lowpan::Decompress(Message &aMessage, const Mac::Address &aMacSource, const
} }
exit: exit:
return (error == kThreadError_None) ? static_cast<int>(cur - aBuf) : -1;
if (error != kThreadError_None)
{
return -1;
}
return static_cast<int>(cur - aBuf);
} }
} // namespace Lowpan } // namespace Lowpan