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

Remove globals from icmp6.cpp.

Browse Source
This commit is contained in:
Jonathan Hui
2016-09-07 13:30:22 -07:00
parent 7f899dc6dd
commit 2029ef62eb
9 changed files with 89 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/ip6.cpp
+5 -4
View File
@@ -48,6 +48,7 @@ namespace Thread {
namespace Ip6 {
Ip6::Ip6(void):
mIcmp(*this),
mForwardingEnabled(false),
mReceiveIp6DatagramCallback(NULL),
mReceiveIp6DatagramCallbackContext(NULL),
@@ -181,7 +182,7 @@ ThreadError Ip6::SendDatagram(Message &message, MessageInfo &messageInfo, IpProt
break;
case kProtoIcmp6:
SuccessOrExit(error = Icmp::UpdateChecksum(message, checksum));
SuccessOrExit(error = mIcmp.UpdateChecksum(message, checksum));
break;
default:
@@ -306,7 +307,7 @@ exit:
return error;
}
ThreadError HandlePayload(Message &message, MessageInfo &messageInfo, uint8_t ipproto)
ThreadError Ip6::HandlePayload(Message &message, MessageInfo &messageInfo, uint8_t ipproto)
{
ThreadError error = kThreadError_None;
@@ -316,7 +317,7 @@ ThreadError HandlePayload(Message &message, MessageInfo &messageInfo, uint8_t ip
ExitNow(error = Udp::HandleMessage(message, messageInfo));
case kProtoIcmp6:
ExitNow(error = Icmp::HandleMessage(message, messageInfo));
ExitNow(error = mIcmp.HandleMessage(message, messageInfo));
}
exit:
@@ -339,7 +340,7 @@ void Ip6::ProcessReceiveCallback(const Message &aMessage, const MessageInfo &mes
switch (aIpProto)
{
case kProtoIcmp6:
if (Icmp::IsEchoEnabled())
if (mIcmp.IsEchoEnabled())
{
IcmpHeader icmp;
aMessage.Read(aMessage.GetOffset(), sizeof(icmp), &icmp);