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

[icmp] change SendIcmpError() to return void (#4941)

Browse Source
This commit is contained in:
Jonathan Hui
2020-05-11 12:44:54 -07:00
parent d20a65b87c
commit e79a7be773
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/ip6.cpp
+8 -4
View File
@@ -884,7 +884,7 @@ void Ip6::UpdateReassemblyList(void)
else
{
otLogNoteIp6("Reassembly timeout.");
IgnoreError(SendIcmpError(*message, IcmpHeader::kTypeTimeExceeded, IcmpHeader::kCodeFragmReasTimeEx));
SendIcmpError(*message, IcmpHeader::kTypeTimeExceeded, IcmpHeader::kCodeFragmReasTimeEx);
IgnoreError(mReassemblyList.Dequeue(*message));
message->Free();
@@ -892,7 +892,7 @@ void Ip6::UpdateReassemblyList(void)
}
}
otError Ip6::SendIcmpError(Message &aMessage, IcmpHeader::Type aIcmpType, IcmpHeader::Code aIcmpCode)
void Ip6::SendIcmpError(Message &aMessage, IcmpHeader::Type aIcmpType, IcmpHeader::Code aIcmpCode)
{
otError error = OT_ERROR_NONE;
Header header;
@@ -905,10 +905,14 @@ otError Ip6::SendIcmpError(Message &aMessage, IcmpHeader::Type aIcmpType, IcmpHe
messageInfo.SetHopLimit(header.GetHopLimit());
messageInfo.SetLinkInfo(NULL);
SuccessOrExit(error = mIcmp.SendError(aIcmpType, aIcmpCode, messageInfo, aMessage));
error = mIcmp.SendError(aIcmpType, aIcmpCode, messageInfo, aMessage);
exit:
return error;
if (error != OT_ERROR_NONE)
{
otLogWarnIp6("Failed to send ICMP error: %s", otThreadErrorToString(error));
}
}
#else
src/core/net/ip6.hpp
+1 -1
View File
@@ -363,7 +363,7 @@ private:
void CleanupFragmentationBuffer(void);
void HandleUpdateTimer(void);
void UpdateReassemblyList(void);
otError SendIcmpError(Message &aMessage, IcmpHeader::Type aIcmpType, IcmpHeader::Code aIcmpCode);
void SendIcmpError(Message &aMessage, IcmpHeader::Type aIcmpType, IcmpHeader::Code aIcmpCode);
static void HandleTimer(Timer &aTimer);
#endif
otError AddMplOption(Message &aMessage, Header &aHeader);