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

IPv6 API cleanup.

Browse Source
This commit is contained in:
Jonathan Hui
2017-01-11 21:55:17 -08:00
parent 669c792118
commit 98da7f3166
34 changed files with 513 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli.cpp
+15 -15
View File
@@ -839,7 +839,7 @@ void Interpreter::ProcessIfconfig(int argc, char *argv[])
if (argc == 0)
{
if (otIsInterfaceUp(mInstance))
if (otIp6IsEnabled(mInstance))
{
sServer->OutputFormat("up\r\n");
}
@@ -850,11 +850,11 @@ void Interpreter::ProcessIfconfig(int argc, char *argv[])
}
else if (strcmp(argv[0], "up") == 0)
{
SuccessOrExit(error = otInterfaceUp(mInstance));
SuccessOrExit(error = otIp6SetEnabled(mInstance, true));
}
else if (strcmp(argv[0], "down") == 0)
{
SuccessOrExit(error = otInterfaceDown(mInstance));
SuccessOrExit(error = otIp6SetEnabled(mInstance, false));
}
exit:
@@ -872,7 +872,7 @@ ThreadError Interpreter::ProcessIpAddrAdd(int argc, char *argv[])
aAddress.mPrefixLength = 64;
aAddress.mPreferred = true;
aAddress.mValid = true;
error = otAddUnicastAddress(mInstance, &aAddress);
error = otIp6AddUnicastAddress(mInstance, &aAddress);
exit:
return error;
@@ -886,7 +886,7 @@ ThreadError Interpreter::ProcessIpAddrDel(int argc, char *argv[])
VerifyOrExit(argc > 0, error = kThreadError_Parse);
SuccessOrExit(error = otIp6AddressFromString(argv[0], &address));
error = otRemoveUnicastAddress(mInstance, &address);
error = otIp6RemoveUnicastAddress(mInstance, &address);
exit:
return error;
@@ -898,7 +898,7 @@ void Interpreter::ProcessIpAddr(int argc, char *argv[])
if (argc == 0)
{
otNetifAddressPtr unicastAddrs(otGetUnicastAddresses(mInstance));
otNetifAddressPtr unicastAddrs(otIp6GetUnicastAddresses(mInstance));
for (const otNetifAddress *addr = unicastAddrs; addr; addr = addr->mNext)
{
@@ -938,7 +938,7 @@ ThreadError Interpreter::ProcessIpMulticastAddrAdd(int argc, char *argv[])
VerifyOrExit(argc > 0, error = kThreadError_Parse);
SuccessOrExit(error = otIp6AddressFromString(argv[0], &address));
error = otSubscribeMulticastAddress(mInstance, &address);
error = otIp6SubscribeMulticastAddress(mInstance, &address);
exit:
return error;
@@ -952,7 +952,7 @@ ThreadError Interpreter::ProcessIpMulticastAddrDel(int argc, char *argv[])
VerifyOrExit(argc > 0, error = kThreadError_Parse);
SuccessOrExit(error = otIp6AddressFromString(argv[0], &address));
error = otUnsubscribeMulticastAddress(mInstance, &address);
error = otIp6UnsubscribeMulticastAddress(mInstance, &address);
exit:
return error;
@@ -964,7 +964,7 @@ ThreadError Interpreter::ProcessMulticastPromiscuous(int argc, char *argv[])
if (argc == 0)
{
if (otIsMulticastPromiscuousModeEnabled(mInstance))
if (otIp6IsMulticastPromiscuousEnabled(mInstance))
{
sServer->OutputFormat("Enabled\r\n");
}
@@ -977,11 +977,11 @@ ThreadError Interpreter::ProcessMulticastPromiscuous(int argc, char *argv[])
{
if (strcmp(argv[0], "enable") == 0)
{
otEnableMulticastPromiscuousMode(mInstance);
otIp6SetMulticastPromiscuousEnabled(mInstance, true);
}
else if (strcmp(argv[0], "disable") == 0)
{
otDisableMulticastPromiscuousMode(mInstance);
otIp6SetMulticastPromiscuousEnabled(mInstance, false);
}
else
{
@@ -999,7 +999,7 @@ void Interpreter::ProcessIpMulticastAddr(int argc, char *argv[])
if (argc == 0)
{
for (const otNetifMulticastAddress *addr = otGetMulticastAddresses(mInstance); addr; addr = addr->mNext)
for (const otNetifMulticastAddress *addr = otIp6GetMulticastAddresses(mInstance); addr; addr = addr->mNext)
{
sServer->OutputFormat("%x:%x:%x:%x:%x:%x:%x:%x\r\n",
HostSwap16(addr->mAddress.mFields.m16[0]),
@@ -1442,7 +1442,7 @@ void Interpreter::HandlePingTimer()
otMessage message;
const otMessageInfo *messageInfo = static_cast<const otMessageInfo *>(&sMessageInfo);
VerifyOrExit((message = otNewIp6Message(mInstance, true)) != NULL, error = kThreadError_NoBufs);
VerifyOrExit((message = otIp6NewMessage(mInstance, true)) != NULL, error = kThreadError_NoBufs);
SuccessOrExit(error = otMessageAppend(message, &timestamp, sizeof(timestamp)));
SuccessOrExit(error = otMessageSetLength(message, sLength));
SuccessOrExit(error = otIcmp6SendEchoRequest(mInstance, message, messageInfo, 1));
@@ -2796,8 +2796,8 @@ void Interpreter::HandleNetifStateChanged(uint32_t aFlags)
VerifyOrExit((aFlags & OT_THREAD_NETDATA_UPDATED) != 0, ;);
#ifndef OTDLL
otSlaacUpdate(mInstance, mSlaacAddresses, sizeof(mSlaacAddresses) / sizeof(mSlaacAddresses[0]), otCreateRandomIid,
NULL);
otIp6SlaacUpdate(mInstance, mSlaacAddresses, sizeof(mSlaacAddresses) / sizeof(mSlaacAddresses[0]),
otIp6CreateRandomIid, NULL);
#if OPENTHREAD_ENABLE_DHCP6_SERVER
otDhcp6ServerUpdate(mInstance);
#endif // OPENTHREAD_ENABLE_DHCP6_SERVER