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

Remove globals from icmp6.cpp.

Browse Source
This commit is contained in:
Jonathan Hui
2016-08-26 14:24:55 -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/cli/cli.cpp
+7 -3
View File
@@ -42,6 +42,7 @@
#include "cli_dataset.hpp"
#include <common/encoding.hpp>
#include <common/new.hpp>
#include <net/ip6.hpp>
#include <platform/random.h>
#include <platform/uart.h>
@@ -49,6 +50,9 @@ using Thread::Encoding::BigEndian::HostSwap16;
using Thread::Encoding::BigEndian::HostSwap32;
namespace Thread {
extern Ip6::Ip6 *sIp6;
namespace Cli {
const struct Command Interpreter::sCommands[] =
@@ -116,7 +120,7 @@ static otNetifAddress sAutoAddresses[8];
void Interpreter::Init(void)
{
Ip6::Icmp::SetEchoReplyHandler(&HandleEchoResponse, NULL);
sIp6->mIcmp.SetEchoReplyHandler(&HandleEchoResponse, NULL);
sPingTimer = new(&sPingTimerBuf) Timer(&HandlePingTimer, NULL);
sLength = 8;
sCount = 1;
@@ -1045,11 +1049,11 @@ void Interpreter::HandlePingTimer(void *aContext)
uint32_t timestamp = HostSwap32(Timer::GetNow());
Message *message;
VerifyOrExit((message = Ip6::Icmp::NewMessage(0)) != NULL, error = kThreadError_NoBufs);
VerifyOrExit((message = sIp6->mIcmp.NewMessage(0)) != NULL, error = kThreadError_NoBufs);
SuccessOrExit(error = message->Append(&timestamp, sizeof(timestamp)));
SuccessOrExit(error = message->SetLength(sLength));
SuccessOrExit(error = Ip6::Icmp::SendEchoRequest(*message, sMessageInfo));
SuccessOrExit(error = sIp6->mIcmp.SendEchoRequest(*message, sMessageInfo));
sCount--;
exit: