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

otInstance Declarations (#473)

Browse Source 
* Add otInstance type declaration and update ot APIs to take it as input.
This commit is contained in:
Nick Banks
2016-09-12 14:29:43 -07:00
committed by Jonathan Hui
parent 9b1de7bbb2
commit ffbe65c6dd
67 changed files with 1560 additions and 1099 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli.cpp
+194 -185
View File
@@ -36,12 +36,14 @@
#include <string.h>
#include <openthread.h>
#include <openthread-config.h>
#include <openthread-diag.h>
#include <commissioning/commissioner.h>
#include <commissioning/joiner.h>
#include "cli.hpp"
#include "cli_dataset.hpp"
#include "cli_uart.hpp"
#include <common/encoding.hpp>
#include <common/new.hpp>
#include <net/ip6.hpp>
@@ -59,84 +61,73 @@ namespace Cli {
const struct Command Interpreter::sCommands[] =
{
{ "help", &ProcessHelp },
{ "blacklist", &ProcessBlacklist },
{ "channel", &ProcessChannel },
{ "child", &ProcessChild },
{ "childmax", &ProcessChildMax },
{ "childtimeout", &ProcessChildTimeout },
{ "help", &Interpreter::ProcessHelp },
{ "blacklist", &Interpreter::ProcessBlacklist },
{ "channel", &Interpreter::ProcessChannel },
{ "child", &Interpreter::ProcessChild },
{ "childmax", &Interpreter::ProcessChildMax },
{ "childtimeout", &Interpreter::ProcessChildTimeout },
#if OPENTHREAD_ENABLE_COMMISSIONER
{ "commissioner", &ProcessCommissioner },
{ "commissioner", &Interpreter::ProcessCommissioner },
#endif
{ "contextreusedelay", &ProcessContextIdReuseDelay },
{ "counter", &ProcessCounters },
{ "dataset", &ProcessDataset },
{ "contextreusedelay", &Interpreter::ProcessContextIdReuseDelay },
{ "counter", &Interpreter::ProcessCounters },
{ "dataset", &Interpreter::ProcessDataset },
#if OPENTHREAD_ENABLE_DIAG
{ "diag", &ProcessDiag },
{ "diag", &Interpreter::ProcessDiag },
#endif
{ "discover", &ProcessDiscover },
{ "eidcache", &ProcessEidCache },
{ "discover", &Interpreter::ProcessDiscover },
{ "eidcache", &Interpreter::ProcessEidCache },
#ifdef OPENTHREAD_EXAMPLES_POSIX
{ "exit", &ProcessExit },
{ "exit", &Interpreter::ProcessExit },
#endif
{ "extaddr", &ProcessExtAddress },
{ "extpanid", &ProcessExtPanId },
{ "ifconfig", &ProcessIfconfig },
{ "ipaddr", &ProcessIpAddr },
{ "extaddr", &Interpreter::ProcessExtAddress },
{ "extpanid", &Interpreter::ProcessExtPanId },
{ "ifconfig", &Interpreter::ProcessIfconfig },
{ "ipaddr", &Interpreter::ProcessIpAddr },
#if OPENTHREAD_ENABLE_JOINER
{ "joiner", &ProcessJoiner },
{ "joiner", &Interpreter::ProcessJoiner },
#endif
{ "keysequence", &ProcessKeySequence },
{ "leaderdata", &ProcessLeaderData },
{ "leaderpartitionid", &ProcessLeaderPartitionId },
{ "leaderweight", &ProcessLeaderWeight },
{ "linkquality", &ProcessLinkQuality },
{ "masterkey", &ProcessMasterKey },
{ "mode", &ProcessMode },
{ "netdataregister", &ProcessNetworkDataRegister },
{ "networkidtimeout", &ProcessNetworkIdTimeout },
{ "networkname", &ProcessNetworkName },
{ "panid", &ProcessPanId },
{ "parent", &ProcessParent },
{ "ping", &ProcessPing },
{ "pollperiod", &ProcessPollPeriod },
{ "promiscuous", &ProcessPromiscuous },
{ "prefix", &ProcessPrefix },
{ "releaserouterid", &ProcessReleaseRouterId },
{ "reset", &ProcessReset },
{ "rloc16", &ProcessRloc16 },
{ "route", &ProcessRoute },
{ "router", &ProcessRouter },
{ "routerrole", &ProcessRouterRole },
{ "routerupgradethreshold", &ProcessRouterUpgradeThreshold },
{ "scan", &ProcessScan },
{ "singleton", &ProcessSingleton },
{ "state", &ProcessState },
{ "thread", &ProcessThread },
{ "version", &ProcessVersion },
{ "whitelist", &ProcessWhitelist },
{ "keysequence", &Interpreter::ProcessKeySequence },
{ "leaderdata", &Interpreter::ProcessLeaderData },
{ "leaderpartitionid", &Interpreter::ProcessLeaderPartitionId },
{ "leaderweight", &Interpreter::ProcessLeaderWeight },
{ "linkquality", &Interpreter::ProcessLinkQuality },
{ "masterkey", &Interpreter::ProcessMasterKey },
{ "mode", &Interpreter::ProcessMode },
{ "netdataregister", &Interpreter::ProcessNetworkDataRegister },
{ "networkidtimeout", &Interpreter::ProcessNetworkIdTimeout },
{ "networkname", &Interpreter::ProcessNetworkName },
{ "panid", &Interpreter::ProcessPanId },
{ "parent", &Interpreter::ProcessParent },
{ "ping", &Interpreter::ProcessPing },
{ "pollperiod", &Interpreter::ProcessPollPeriod },
{ "promiscuous", &Interpreter::ProcessPromiscuous },
{ "prefix", &Interpreter::ProcessPrefix },
{ "releaserouterid", &Interpreter::ProcessReleaseRouterId },
{ "reset", &Interpreter::ProcessReset },
{ "rloc16", &Interpreter::ProcessRloc16 },
{ "route", &Interpreter::ProcessRoute },
{ "router", &Interpreter::ProcessRouter },
{ "routerrole", &Interpreter::ProcessRouterRole },
{ "routerupgradethreshold", &Interpreter::ProcessRouterUpgradeThreshold },
{ "scan", &Interpreter::ProcessScan },
{ "singleton", &Interpreter::ProcessSingleton },
{ "state", &Interpreter::ProcessState },
{ "thread", &Interpreter::ProcessThread },
{ "version", &Interpreter::ProcessVersion },
{ "whitelist", &Interpreter::ProcessWhitelist },
};
static otDEFINE_ALIGNED_VAR(sPingTimerBuf, sizeof(Timer), uint64_t);
Timer *Interpreter::sPingTimer;
Ip6::MessageInfo Interpreter::sMessageInfo;
Server *Interpreter::sServer;
uint8_t Interpreter::sEchoRequest[1500];
uint16_t Interpreter::sLength;
uint16_t Interpreter::sCount;
uint32_t Interpreter::sInterval;
static otNetifAddress sAutoAddresses[8];
void Interpreter::Init(void)
Interpreter::Interpreter(otInstance *aInstance):
sLength(8),
sCount(1),
sInterval(1000),
sPingTimer(sIp6->mTimerScheduler, &Interpreter::s_HandlePingTimer, this),
mInstance(aInstance)
{
sIp6->mIcmp.SetEchoReplyHandler(&HandleEchoResponse, NULL);
sPingTimer = new(&sPingTimerBuf) Timer(sIp6->mTimerScheduler, &HandlePingTimer, NULL);
sLength = 8;
sCount = 1;
sInterval = 1000;
otSetStateChangedCallback(&HandleNetifStateChanged, NULL);
sIp6->mIcmp.SetEchoReplyHandler(&s_HandleEchoResponse, this);
otSetStateChangedCallback(mInstance, &Interpreter::s_HandleNetifStateChanged, this);
}
int Interpreter::Hex2Bin(const char *aHex, uint8_t *aBin, uint16_t aBinLength)
@@ -243,7 +234,7 @@ void Interpreter::ProcessBlacklist(int argc, char *argv[])
if (argcur >= argc)
{
if (otIsMacBlacklistEnabled())
if (otIsMacBlacklistEnabled(mInstance))
{
sServer->OutputFormat("Enabled\r\n");
}
@@ -254,7 +245,7 @@ void Interpreter::ProcessBlacklist(int argc, char *argv[])
for (uint8_t i = 0; ; i++)
{
if (otGetMacBlacklistEntry(i, &entry) != kThreadError_None)
if (otGetMacBlacklistEntry(mInstance, i, &entry) != kThreadError_None)
{
break;
}
@@ -274,26 +265,26 @@ void Interpreter::ProcessBlacklist(int argc, char *argv[])
VerifyOrExit(++argcur < argc, error = kThreadError_Parse);
VerifyOrExit(Hex2Bin(argv[argcur], extAddr, sizeof(extAddr)) == sizeof(extAddr), error = kThreadError_Parse);
otAddMacBlacklist(extAddr);
VerifyOrExit(otAddMacBlacklist(extAddr) == kThreadError_None, error = kThreadError_Parse);
otAddMacBlacklist(mInstance, extAddr);
VerifyOrExit(otAddMacBlacklist(mInstance, extAddr) == kThreadError_None, error = kThreadError_Parse);
}
else if (strcmp(argv[argcur], "clear") == 0)
{
otClearMacBlacklist();
otClearMacBlacklist(mInstance);
}
else if (strcmp(argv[argcur], "disable") == 0)
{
otDisableMacBlacklist();
otDisableMacBlacklist(mInstance);
}
else if (strcmp(argv[argcur], "enable") == 0)
{
otEnableMacBlacklist();
otEnableMacBlacklist(mInstance);
}
else if (strcmp(argv[argcur], "remove") == 0)
{
VerifyOrExit(++argcur < argc, error = kThreadError_Parse);
VerifyOrExit(Hex2Bin(argv[argcur], extAddr, sizeof(extAddr)) == sizeof(extAddr), error = kThreadError_Parse);
otRemoveMacBlacklist(extAddr);
otRemoveMacBlacklist(mInstance, extAddr);
}
exit:
@@ -307,12 +298,12 @@ void Interpreter::ProcessChannel(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%d\r\n", otGetChannel());
sServer->OutputFormat("%d\r\n", otGetChannel(mInstance));
}
else
{
SuccessOrExit(error = ParseLong(argv[0], value));
otSetChannel(static_cast<uint8_t>(value));
otSetChannel(mInstance, static_cast<uint8_t>(value));
}
exit:
@@ -331,7 +322,7 @@ void Interpreter::ProcessChild(int argc, char *argv[])
{
for (uint8_t i = 0; ; i++)
{
if (otGetChildInfoByIndex(i, &childInfo) != kThreadError_None)
if (otGetChildInfoByIndex(mInstance, i, &childInfo) != kThreadError_None)
{
sServer->OutputFormat("\r\n");
ExitNow();
@@ -345,7 +336,7 @@ void Interpreter::ProcessChild(int argc, char *argv[])
}
SuccessOrExit(error = ParseLong(argv[0], value));
SuccessOrExit(error = otGetChildInfoById(static_cast<uint16_t>(value), &childInfo));
SuccessOrExit(error = otGetChildInfoById(mInstance, static_cast<uint16_t>(value), &childInfo));
sServer->OutputFormat("Child ID: %d\r\n", childInfo.mChildId);
sServer->OutputFormat("Rloc: %04x\r\n", childInfo.mRloc16);
@@ -398,12 +389,12 @@ void Interpreter::ProcessChildMax(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%d\r\n", otGetMaxAllowedChildren());
sServer->OutputFormat("%d\r\n", otGetMaxAllowedChildren(mInstance));
}
else
{
SuccessOrExit(error = ParseLong(argv[0], value));
SuccessOrExit(error = otSetMaxAllowedChildren(static_cast<uint8_t>(value)));
SuccessOrExit(error = otSetMaxAllowedChildren(mInstance, static_cast<uint8_t>(value)));
}
exit:
@@ -417,12 +408,12 @@ void Interpreter::ProcessChildTimeout(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%d\r\n", otGetChildTimeout());
sServer->OutputFormat("%d\r\n", otGetChildTimeout(mInstance));
}
else
{
SuccessOrExit(error = ParseLong(argv[0], value));
otSetChildTimeout(static_cast<uint32_t>(value));
otSetChildTimeout(mInstance, static_cast<uint32_t>(value));
}
exit:
@@ -436,12 +427,12 @@ void Interpreter::ProcessContextIdReuseDelay(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%d\r\n", otGetContextIdReuseDelay());
sServer->OutputFormat("%d\r\n", otGetContextIdReuseDelay(mInstance));
}
else
{
SuccessOrExit(ParseLong(argv[0], value));
otSetContextIdReuseDelay(static_cast<uint32_t>(value));
otSetContextIdReuseDelay(mInstance, static_cast<uint32_t>(value));
}
exit:
@@ -459,7 +450,7 @@ void Interpreter::ProcessCounters(int argc, char *argv[])
{
if (strcmp(argv[0], "mac") == 0)
{
const otMacCounters *counters = otGetMacCounters();
const otMacCounters *counters = otGetMacCounters(mInstance);
sServer->OutputFormat("TxTotal: %d\r\n", counters->mTxTotal);
sServer->OutputFormat(" TxAckRequested: %d\r\n", counters->mTxAckRequested);
sServer->OutputFormat(" TxAcked: %d\r\n", counters->mTxAcked);
@@ -492,7 +483,7 @@ void Interpreter::ProcessCounters(int argc, char *argv[])
void Interpreter::ProcessDataset(int argc, char *argv[])
{
ThreadError error;
error = Dataset::Process(argc, argv, *sServer);
error = Dataset::Process(mInstance, argc, argv, *sServer);
AppendResult(error);
}
@@ -508,7 +499,8 @@ void Interpreter::ProcessDiscover(int argc, char *argv[])
scanChannels = 1 << value;
}
SuccessOrExit(error = otDiscover(scanChannels, 0, OT_PANID_BROADCAST, &HandleActiveScanResult, NULL));
SuccessOrExit(error = otDiscover(mInstance, scanChannels, 0, OT_PANID_BROADCAST,
&Interpreter::s_HandleActiveScanResult, this));
sServer->OutputFormat("| J | Network Name | Extended PAN | PAN | MAC Address | Ch | dBm | LQI |\r\n");
sServer->OutputFormat("+---+------------------+------------------+------+------------------+----+-----+-----+\r\n");
@@ -524,7 +516,7 @@ void Interpreter::ProcessEidCache(int argc, char *argv[])
for (uint8_t i = 0; ; i++)
{
SuccessOrExit(otGetEidCacheEntry(i, &entry));
SuccessOrExit(otGetEidCacheEntry(mInstance, i, &entry));
if (entry.mValid == false)
{
@@ -555,7 +547,7 @@ void Interpreter::ProcessExtAddress(int argc, char *argv[])
if (argc == 0)
{
OutputBytes(otGetExtendedAddress(), OT_EXT_ADDRESS_SIZE);
OutputBytes(otGetExtendedAddress(mInstance), OT_EXT_ADDRESS_SIZE);
sServer->OutputFormat("\r\n");
}
else
@@ -564,7 +556,7 @@ void Interpreter::ProcessExtAddress(int argc, char *argv[])
VerifyOrExit(Hex2Bin(argv[0], extAddress.m8, sizeof(otExtAddress)) >= 0, error = kThreadError_Parse);
otSetExtendedAddress(&extAddress);
otSetExtendedAddress(mInstance, &extAddress);
}
exit:
@@ -586,7 +578,7 @@ void Interpreter::ProcessExtPanId(int argc, char *argv[])
if (argc == 0)
{
OutputBytes(otGetExtendedPanId(), OT_EXT_PAN_ID_SIZE);
OutputBytes(otGetExtendedPanId(mInstance), OT_EXT_PAN_ID_SIZE);
sServer->OutputFormat("\r\n");
}
else
@@ -595,7 +587,7 @@ void Interpreter::ProcessExtPanId(int argc, char *argv[])
VerifyOrExit(Hex2Bin(argv[0], extPanId, sizeof(extPanId)) >= 0, error = kThreadError_Parse);
otSetExtendedPanId(extPanId);
otSetExtendedPanId(mInstance, extPanId);
}
exit:
@@ -608,7 +600,7 @@ void Interpreter::ProcessIfconfig(int argc, char *argv[])
if (argc == 0)
{
if (otIsInterfaceUp())
if (otIsInterfaceUp(mInstance))
{
sServer->OutputFormat("up\r\n");
}
@@ -619,11 +611,11 @@ void Interpreter::ProcessIfconfig(int argc, char *argv[])
}
else if (strcmp(argv[0], "up") == 0)
{
SuccessOrExit(error = otInterfaceUp());
SuccessOrExit(error = otInterfaceUp(mInstance));
}
else if (strcmp(argv[0], "down") == 0)
{
SuccessOrExit(error = otInterfaceDown());
SuccessOrExit(error = otInterfaceDown(mInstance));
}
exit:
@@ -641,7 +633,7 @@ ThreadError Interpreter::ProcessIpAddrAdd(int argc, char *argv[])
aAddress.mPrefixLength = 64;
aAddress.mPreferredLifetime = 0xffffffff;
aAddress.mValidLifetime = 0xffffffff;
error = otAddUnicastAddress(&aAddress);
error = otAddUnicastAddress(mInstance, &aAddress);
exit:
return error;
@@ -655,7 +647,7 @@ ThreadError Interpreter::ProcessIpAddrDel(int argc, char *argv[])
VerifyOrExit(argc > 0, error = kThreadError_Parse);
SuccessOrExit(error = otIp6AddressFromString(argv[0], &address));
error = otRemoveUnicastAddress(&address);
error = otRemoveUnicastAddress(mInstance, &address);
exit:
return error;
@@ -667,7 +659,7 @@ void Interpreter::ProcessIpAddr(int argc, char *argv[])
if (argc == 0)
{
for (const otNetifAddress *addr = otGetUnicastAddresses(); addr; addr = addr->mNext)
for (const otNetifAddress *addr = otGetUnicastAddresses(mInstance); addr; addr = addr->mNext)
{
sServer->OutputFormat("%x:%x:%x:%x:%x:%x:%x:%x\r\n",
HostSwap16(addr->mAddress.mFields.m16[0]),
@@ -703,12 +695,12 @@ void Interpreter::ProcessKeySequence(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%d\r\n", otGetKeySequenceCounter());
sServer->OutputFormat("%d\r\n", otGetKeySequenceCounter(mInstance));
}
else
{
SuccessOrExit(error = ParseLong(argv[0], value));
otSetKeySequenceCounter(static_cast<uint32_t>(value));
otSetKeySequenceCounter(mInstance, static_cast<uint32_t>(value));
}
exit:
@@ -720,7 +712,7 @@ void Interpreter::ProcessLeaderData(int argc, char *argv[])
ThreadError error;
otLeaderData leaderData;
SuccessOrExit(error = otGetLeaderData(&leaderData));
SuccessOrExit(error = otGetLeaderData(mInstance, &leaderData));
sServer->OutputFormat("Partition ID: %u\r\n", leaderData.mPartitionId);
sServer->OutputFormat("Weighting: %d\r\n", leaderData.mWeighting);
@@ -741,12 +733,12 @@ void Interpreter::ProcessLeaderPartitionId(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%u\r\n", otGetLocalLeaderPartitionId());
sServer->OutputFormat("%u\r\n", otGetLocalLeaderPartitionId(mInstance));
}
else
{
SuccessOrExit(error = ParseUnsignedLong(argv[0], value));
otSetLocalLeaderPartitionId(static_cast<uint32_t>(value));
otSetLocalLeaderPartitionId(mInstance, static_cast<uint32_t>(value));
}
exit:
@@ -760,12 +752,12 @@ void Interpreter::ProcessLeaderWeight(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%d\r\n", otGetLocalLeaderWeight());
sServer->OutputFormat("%d\r\n", otGetLocalLeaderWeight(mInstance));
}
else
{
SuccessOrExit(error = ParseLong(argv[0], value));
otSetLocalLeaderWeight(static_cast<uint8_t>(value));
otSetLocalLeaderWeight(mInstance, static_cast<uint8_t>(value));
}
exit:
@@ -783,14 +775,14 @@ void Interpreter::ProcessLinkQuality(int argc, char *argv[])
if (argc == 1)
{
VerifyOrExit(otGetAssignLinkQuality(extAddress, &linkQuality) == kThreadError_None,
VerifyOrExit(otGetAssignLinkQuality(mInstance, extAddress, &linkQuality) == kThreadError_None,
error = kThreadError_InvalidArgs);
sServer->OutputFormat("%d\r\n", linkQuality);
}
else
{
SuccessOrExit(error = ParseLong(argv[1], value));
otSetAssignLinkQuality(extAddress, static_cast<uint8_t>(value));
otSetAssignLinkQuality(mInstance, extAddress, static_cast<uint8_t>(value));
}
exit:
@@ -804,7 +796,7 @@ void Interpreter::ProcessMasterKey(int argc, char *argv[])
if (argc == 0)
{
uint8_t keyLength;
const uint8_t *key = otGetMasterKey(&keyLength);
const uint8_t *key = otGetMasterKey(mInstance, &keyLength);
for (int i = 0; i < keyLength; i++)
{
@@ -819,7 +811,7 @@ void Interpreter::ProcessMasterKey(int argc, char *argv[])
uint8_t key[OT_MASTER_KEY_SIZE];
VerifyOrExit((keyLength = Hex2Bin(argv[0], key, sizeof(key))) == OT_MASTER_KEY_SIZE, error = kThreadError_Parse);
SuccessOrExit(error = otSetMasterKey(key, static_cast<uint8_t>(keyLength)));
SuccessOrExit(error = otSetMasterKey(mInstance, key, static_cast<uint8_t>(keyLength)));
}
exit:
@@ -835,7 +827,7 @@ void Interpreter::ProcessMode(int argc, char *argv[])
if (argc == 0)
{
linkMode = otGetLinkMode();
linkMode = otGetLinkMode(mInstance);
if (linkMode.mRxOnWhenIdle)
{
@@ -886,7 +878,7 @@ void Interpreter::ProcessMode(int argc, char *argv[])
}
}
SuccessOrExit(error = otSetLinkMode(linkMode));
SuccessOrExit(error = otSetLinkMode(mInstance, linkMode));
}
exit:
@@ -896,7 +888,7 @@ exit:
void Interpreter::ProcessNetworkDataRegister(int argc, char *argv[])
{
ThreadError error = kThreadError_None;
SuccessOrExit(error = otSendServerData());
SuccessOrExit(error = otSendServerData(mInstance));
exit:
(void)argc;
@@ -911,12 +903,12 @@ void Interpreter::ProcessNetworkIdTimeout(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%d\r\n", otGetNetworkIdTimeout());
sServer->OutputFormat("%d\r\n", otGetNetworkIdTimeout(mInstance));
}
else
{
SuccessOrExit(error = ParseLong(argv[0], value));
otSetNetworkIdTimeout(static_cast<uint8_t>(value));
otSetNetworkIdTimeout(mInstance, static_cast<uint8_t>(value));
}
exit:
@@ -929,11 +921,11 @@ void Interpreter::ProcessNetworkName(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%.*s\r\n", OT_NETWORK_NAME_MAX_SIZE, otGetNetworkName());
sServer->OutputFormat("%.*s\r\n", OT_NETWORK_NAME_MAX_SIZE, otGetNetworkName(mInstance));
}
else
{
SuccessOrExit(error = otSetNetworkName(argv[0]));
SuccessOrExit(error = otSetNetworkName(mInstance, argv[0]));
}
exit:
@@ -947,12 +939,12 @@ void Interpreter::ProcessPanId(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%d\r\n", otGetPanId());
sServer->OutputFormat("%d\r\n", otGetPanId(mInstance));
}
else
{
SuccessOrExit(error = ParseLong(argv[0], value));
otSetPanId(static_cast<otPanId>(value));
otSetPanId(mInstance, static_cast<otPanId>(value));
}
exit:
@@ -964,7 +956,7 @@ void Interpreter::ProcessParent(int argc, char *argv[])
ThreadError error = kThreadError_None;
otRouterInfo parentInfo;
SuccessOrExit(error = otGetParentInfo(&parentInfo));
SuccessOrExit(error = otGetParentInfo(mInstance, &parentInfo));
sServer->OutputFormat("Ext Addr: ");
for (size_t i = 0; i < sizeof(parentInfo.mExtAddress); i++)
@@ -982,7 +974,12 @@ exit:
AppendResult(error);
}
void Interpreter::HandleEchoResponse(void *aContext, Message &aMessage, const Ip6::MessageInfo &aMessageInfo)
void Interpreter::s_HandleEchoResponse(void *aContext, Message &aMessage, const Ip6::MessageInfo &aMessageInfo)
{
static_cast<Interpreter *>(aContext)->HandleEchoResponse(aMessage, aMessageInfo);
}
void Interpreter::HandleEchoResponse(Message &aMessage, const Ip6::MessageInfo &aMessageInfo)
{
Ip6::IcmpHeader icmp6Header;
uint32_t timestamp = 0;
@@ -1008,8 +1005,6 @@ void Interpreter::HandleEchoResponse(void *aContext, Message &aMessage, const Ip
}
sServer->OutputFormat("\r\n");
(void)aContext;
}
void Interpreter::ProcessPing(int argc, char *argv[])
@@ -1019,7 +1014,7 @@ void Interpreter::ProcessPing(int argc, char *argv[])
long value;
VerifyOrExit(argc > 0, error = kThreadError_Parse);
VerifyOrExit(!sPingTimer->IsRunning(), error = kThreadError_Busy);
VerifyOrExit(!sPingTimer.IsRunning(), error = kThreadError_Busy);
memset(&sMessageInfo, 0, sizeof(sMessageInfo));
SuccessOrExit(error = sMessageInfo.GetPeerAddr().FromString(argv[0]));
@@ -1055,7 +1050,7 @@ void Interpreter::ProcessPing(int argc, char *argv[])
index++;
}
HandlePingTimer(NULL);
HandlePingTimer();
return;
@@ -1063,7 +1058,12 @@ exit:
AppendResult(error);
}
void Interpreter::HandlePingTimer(void *aContext)
void Interpreter::s_HandlePingTimer(void *aContext)
{
static_cast<Interpreter *>(aContext)->HandlePingTimer();
}
void Interpreter::HandlePingTimer()
{
ThreadError error = kThreadError_None;
uint32_t timestamp = HostSwap32(Timer::GetNow());
@@ -1085,10 +1085,8 @@ exit:
if (sCount)
{
sPingTimer->Start(sInterval);
sPingTimer.Start(sInterval);
}
(void)aContext;
}
void Interpreter::ProcessPollPeriod(int argc, char *argv[])
@@ -1098,12 +1096,12 @@ void Interpreter::ProcessPollPeriod(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%d\r\n", (otGetPollPeriod() / 1000)); // ms->s
sServer->OutputFormat("%d\r\n", (otGetPollPeriod(mInstance) / 1000)); // ms->s
}
else
{
SuccessOrExit(error = ParseLong(argv[0], value));
otSetPollPeriod(static_cast<uint32_t>(value * 1000)); // s->ms
otSetPollPeriod(mInstance, static_cast<uint32_t>(value * 1000)); // s->ms
}
exit:
@@ -1116,7 +1114,7 @@ void Interpreter::ProcessPromiscuous(int argc, char *argv[])
if (argc == 0)
{
if (otIsLinkPromiscuous() && otPlatRadioGetPromiscuous())
if (otIsLinkPromiscuous(mInstance) && otPlatRadioGetPromiscuous(mInstance))
{
sServer->OutputFormat("Enabled\r\n");
}
@@ -1129,13 +1127,13 @@ void Interpreter::ProcessPromiscuous(int argc, char *argv[])
{
if (strcmp(argv[0], "enable") == 0)
{
otSetLinkPcapCallback(&HandleLinkPcapReceive, NULL);
SuccessOrExit(error = otSetLinkPromiscuous(true));
otSetLinkPcapCallback(mInstance, &s_HandleLinkPcapReceive, this);
SuccessOrExit(error = otSetLinkPromiscuous(mInstance, true));
}
else if (strcmp(argv[0], "disable") == 0)
{
otSetLinkPcapCallback(NULL, NULL);
SuccessOrExit(error = otSetLinkPromiscuous(false));
otSetLinkPcapCallback(mInstance, NULL, NULL);
SuccessOrExit(error = otSetLinkPromiscuous(mInstance, false));
}
}
@@ -1143,7 +1141,12 @@ exit:
AppendResult(error);
}
void Interpreter::HandleLinkPcapReceive(const RadioPacket *aFrame, void *aContext)
void Interpreter::s_HandleLinkPcapReceive(const RadioPacket *aFrame, void *aContext)
{
static_cast<Interpreter *>(aContext)->HandleLinkPcapReceive(aFrame);
}
void Interpreter::HandleLinkPcapReceive(const RadioPacket *aFrame)
{
sServer->OutputFormat("\r\n");
@@ -1207,8 +1210,6 @@ void Interpreter::HandleLinkPcapReceive(const RadioPacket *aFrame, void *aContex
}
sServer->OutputFormat("\r\n");
(void) aContext;
}
ThreadError Interpreter::ProcessPrefixAdd(int argc, char *argv[])
@@ -1295,7 +1296,7 @@ ThreadError Interpreter::ProcessPrefixAdd(int argc, char *argv[])
}
}
error = otAddBorderRouter(&config);
error = otAddBorderRouter(mInstance, &config);
exit:
return error;
@@ -1328,7 +1329,7 @@ ThreadError Interpreter::ProcessPrefixRemove(int argc, char *argv[])
ExitNow(error = kThreadError_Parse);
}
error = otRemoveBorderRouter(&prefix);
error = otRemoveBorderRouter(mInstance, &prefix);
exit:
(void)argc;
@@ -1340,7 +1341,7 @@ ThreadError Interpreter::ProcessPrefixList(void)
otNetworkDataIterator iterator = OT_NETWORK_DATA_ITERATOR_INIT;
otBorderRouterConfig config;
while (otGetNextOnMeshPrefix(true, &iterator, &config) == kThreadError_None)
while (otGetNextOnMeshPrefix(mInstance, true, &iterator, &config) == kThreadError_None)
{
sServer->OutputFormat("%x:%x:%x:%x::/%d ",
HostSwap16(config.mPrefix.mPrefix.mFields.m16[0]),
@@ -1436,7 +1437,7 @@ void Interpreter::ProcessReleaseRouterId(int argc, char *argv[])
VerifyOrExit(argc > 0, error = kThreadError_Parse);
SuccessOrExit(error = ParseLong(argv[0], value));
SuccessOrExit(error = otReleaseRouterId(static_cast<uint8_t>(value)));
SuccessOrExit(error = otReleaseRouterId(mInstance, static_cast<uint8_t>(value)));
exit:
AppendResult(error);
@@ -1444,14 +1445,14 @@ exit:
void Interpreter::ProcessReset(int argc, char *argv[])
{
otPlatformReset();
otPlatformReset(mInstance);
(void)argc;
(void)argv;
}
void Interpreter::ProcessRloc16(int argc, char *argv[])
{
sServer->OutputFormat("%04x\r\n", otGetRloc16());
sServer->OutputFormat("%04x\r\n", otGetRloc16(mInstance));
sServer->OutputFormat("Done\r\n");
(void)argc;
(void)argv;
@@ -1512,7 +1513,7 @@ ThreadError Interpreter::ProcessRouteAdd(int argc, char *argv[])
}
}
error = otAddExternalRoute(&config);
error = otAddExternalRoute(mInstance, &config);
exit:
return error;
@@ -1546,7 +1547,7 @@ ThreadError Interpreter::ProcessRouteRemove(int argc, char *argv[])
ExitNow(error = kThreadError_Parse);
}
error = otRemoveExternalRoute(&prefix);
error = otRemoveExternalRoute(mInstance, &prefix);
exit:
return error;
@@ -1587,7 +1588,7 @@ void Interpreter::ProcessRouter(int argc, char *argv[])
{
for (uint8_t i = 0; ; i++)
{
if (otGetRouterInfo(i, &routerInfo) != kThreadError_None)
if (otGetRouterInfo(mInstance, i, &routerInfo) != kThreadError_None)
{
sServer->OutputFormat("\r\n");
ExitNow();
@@ -1601,7 +1602,7 @@ void Interpreter::ProcessRouter(int argc, char *argv[])
}
SuccessOrExit(error = ParseLong(argv[0], value));
SuccessOrExit(error = otGetRouterInfo(static_cast<uint16_t>(value), &routerInfo));
SuccessOrExit(error = otGetRouterInfo(mInstance, static_cast<uint16_t>(value), &routerInfo));
sServer->OutputFormat("Alloc: %d\r\n", routerInfo.mAllocated);
@@ -1639,7 +1640,7 @@ void Interpreter::ProcessRouterRole(int argc, char *argv[])
if (argc == 0)
{
if (otIsRouterRoleEnabled())
if (otIsRouterRoleEnabled(mInstance))
{
sServer->OutputFormat("Enabled\r\n");
}
@@ -1650,11 +1651,11 @@ void Interpreter::ProcessRouterRole(int argc, char *argv[])
}
else if (strcmp(argv[0], "enable") == 0)
{
otSetRouterRoleEnabled(true);
otSetRouterRoleEnabled(mInstance, true);
}
else if (strcmp(argv[0], "disable") == 0)
{
otSetRouterRoleEnabled(false);
otSetRouterRoleEnabled(mInstance, false);
}
else
{
@@ -1672,12 +1673,12 @@ void Interpreter::ProcessRouterUpgradeThreshold(int argc, char *argv[])
if (argc == 0)
{
sServer->OutputFormat("%d\r\n", otGetRouterUpgradeThreshold());
sServer->OutputFormat("%d\r\n", otGetRouterUpgradeThreshold(mInstance));
}
else
{
SuccessOrExit(error = ParseLong(argv[0], value));
otSetRouterUpgradeThreshold(static_cast<uint8_t>(value));
otSetRouterUpgradeThreshold(mInstance, static_cast<uint8_t>(value));
}
exit:
@@ -1696,7 +1697,7 @@ void Interpreter::ProcessScan(int argc, char *argv[])
scanChannels = 1 << value;
}
SuccessOrExit(error = otActiveScan(scanChannels, 0, &HandleActiveScanResult, NULL));
SuccessOrExit(error = otActiveScan(mInstance, scanChannels, 0, &Interpreter::s_HandleActiveScanResult, this));
sServer->OutputFormat("| J | Network Name | Extended PAN | PAN | MAC Address | Ch | dBm | LQI |\r\n");
sServer->OutputFormat("+---+------------------+------------------+------+------------------+----+-----+-----+\r\n");
@@ -1706,7 +1707,12 @@ exit:
AppendResult(error);
}
void Interpreter::HandleActiveScanResult(otActiveScanResult *aResult, void *aContext)
void Interpreter::s_HandleActiveScanResult(otActiveScanResult *aResult, void *aContext)
{
static_cast<Interpreter *>(aContext)->HandleActiveScanResult(aResult);
}
void Interpreter::HandleActiveScanResult(otActiveScanResult *aResult)
{
if (aResult == NULL)
{
@@ -1729,7 +1735,6 @@ void Interpreter::HandleActiveScanResult(otActiveScanResult *aResult, void *aCon
sServer->OutputFormat("| %3d |\r\n", aResult->mLqi);
exit:
(void)aContext;
return;
}
@@ -1737,7 +1742,7 @@ void Interpreter::ProcessSingleton(int argc, char *argv[])
{
ThreadError error = kThreadError_None;
if (otIsSingleton())
if (otIsSingleton(mInstance))
{
sServer->OutputFormat("true\r\n");
}
@@ -1758,7 +1763,7 @@ void Interpreter::ProcessState(int argc, char *argv[])
if (argc == 0)
{
switch (otGetDeviceRole())
switch (otGetDeviceRole(mInstance))
{
case kDeviceRoleDisabled:
sServer->OutputFormat("disabled\r\n");
@@ -1785,19 +1790,19 @@ void Interpreter::ProcessState(int argc, char *argv[])
{
if (strcmp(argv[0], "detached") == 0)
{
SuccessOrExit(error = otBecomeDetached());
SuccessOrExit(error = otBecomeDetached(mInstance));
}
else if (strcmp(argv[0], "child") == 0)
{
SuccessOrExit(error = otBecomeChild(kMleAttachSamePartition));
SuccessOrExit(error = otBecomeChild(mInstance, kMleAttachSamePartition));
}
else if (strcmp(argv[0], "router") == 0)
{
SuccessOrExit(error = otBecomeRouter());
SuccessOrExit(error = otBecomeRouter(mInstance));
}
else if (strcmp(argv[0], "leader") == 0)
{
SuccessOrExit(error = otBecomeLeader());
SuccessOrExit(error = otBecomeLeader(mInstance));
}
else
{
@@ -1817,11 +1822,11 @@ void Interpreter::ProcessThread(int argc, char *argv[])
if (strcmp(argv[0], "start") == 0)
{
SuccessOrExit(error = otThreadStart());
SuccessOrExit(error = otThreadStart(mInstance));
}
else if (strcmp(argv[0], "stop") == 0)
{
SuccessOrExit(error = otThreadStop());
SuccessOrExit(error = otThreadStop(mInstance));
}
exit:
@@ -1849,11 +1854,11 @@ void Interpreter::ProcessCommissioner(int argc, char *argv[])
if (strcmp(argv[0], "start") == 0)
{
VerifyOrExit(argc > 1, error = kThreadError_Parse);
otCommissionerStart(argv[1]);
otCommissionerStart(mInstance, argv[1]);
}
else if (strcmp(argv[0], "stop") == 0)
{
otCommissionerStop();
otCommissionerStop(mInstance);
}
exit:
@@ -1873,11 +1878,11 @@ void Interpreter::ProcessJoiner(int argc, char *argv[])
if (strcmp(argv[0], "start") == 0)
{
VerifyOrExit(argc > 1, error = kThreadError_Parse);
otJoinerStart(argv[1]);
otJoinerStart(mInstance, argv[1]);
}
else if (strcmp(argv[0], "stop") == 0)
{
otJoinerStop();
otJoinerStop(mInstance);
}
exit:
@@ -1896,7 +1901,7 @@ void Interpreter::ProcessWhitelist(int argc, char *argv[])
if (argcur >= argc)
{
if (otIsMacWhitelistEnabled())
if (otIsMacWhitelistEnabled(mInstance))
{
sServer->OutputFormat("Enabled\r\n");
}
@@ -1907,7 +1912,7 @@ void Interpreter::ProcessWhitelist(int argc, char *argv[])
for (uint8_t i = 0; ; i++)
{
if (otGetMacWhitelistEntry(i, &entry) != kThreadError_None)
if (otGetMacWhitelistEntry(mInstance, i, &entry) != kThreadError_None)
{
break;
}
@@ -1935,31 +1940,31 @@ void Interpreter::ProcessWhitelist(int argc, char *argv[])
if (++argcur < argc)
{
rssi = static_cast<int8_t>(strtol(argv[argcur], NULL, 0));
VerifyOrExit(otAddMacWhitelistRssi(extAddr, rssi) == kThreadError_None, error = kThreadError_Parse);
VerifyOrExit(otAddMacWhitelistRssi(mInstance, extAddr, rssi) == kThreadError_None, error = kThreadError_Parse);
}
else
{
otAddMacWhitelist(extAddr);
VerifyOrExit(otAddMacWhitelist(extAddr) == kThreadError_None, error = kThreadError_Parse);
otAddMacWhitelist(mInstance, extAddr);
VerifyOrExit(otAddMacWhitelist(mInstance, extAddr) == kThreadError_None, error = kThreadError_Parse);
}
}
else if (strcmp(argv[argcur], "clear") == 0)
{
otClearMacWhitelist();
otClearMacWhitelist(mInstance);
}
else if (strcmp(argv[argcur], "disable") == 0)
{
otDisableMacWhitelist();
otDisableMacWhitelist(mInstance);
}
else if (strcmp(argv[argcur], "enable") == 0)
{
otEnableMacWhitelist();
otEnableMacWhitelist(mInstance);
}
else if (strcmp(argv[argcur], "remove") == 0)
{
VerifyOrExit(++argcur < argc, error = kThreadError_Parse);
VerifyOrExit(Hex2Bin(argv[argcur], extAddr, sizeof(extAddr)) == sizeof(extAddr), error = kThreadError_Parse);
otRemoveMacWhitelist(extAddr);
otRemoveMacWhitelist(mInstance, extAddr);
}
exit:
@@ -2013,7 +2018,7 @@ void Interpreter::ProcessLine(char *aBuf, uint16_t aBufLength, Server &aServer)
{
if (strcmp(cmd, sCommands[i].mName) == 0)
{
sCommands[i].mCommand(argc, argv);
(this->*sCommands[i].mCommand)(argc, argv);
break;
}
}
@@ -2022,7 +2027,12 @@ exit:
return;
}
void Interpreter::HandleNetifStateChanged(uint32_t aFlags, void *aContext)
void Interpreter::s_HandleNetifStateChanged(uint32_t aFlags, void *aContext)
{
static_cast<Interpreter *>(aContext)->HandleNetifStateChanged(aFlags);
}
void Interpreter::HandleNetifStateChanged(uint32_t aFlags)
{
otNetworkDataIterator iterator;
otBorderRouterConfig config;
@@ -2042,7 +2052,7 @@ void Interpreter::HandleNetifStateChanged(uint32_t aFlags, void *aContext)
iterator = OT_NETWORK_DATA_ITERATOR_INIT;
while (otGetNextOnMeshPrefix(false, &iterator, &config) == kThreadError_None)
while (otGetNextOnMeshPrefix(mInstance, false, &iterator, &config) == kThreadError_None)
{
if (config.mSlaac == false)
{
@@ -2059,7 +2069,7 @@ void Interpreter::HandleNetifStateChanged(uint32_t aFlags, void *aContext)
if (!found)
{
otRemoveUnicastAddress(&address->mAddress);
otRemoveUnicastAddress(mInstance, &address->mAddress);
address->mValidLifetime = 0;
}
}
@@ -2067,7 +2077,7 @@ void Interpreter::HandleNetifStateChanged(uint32_t aFlags, void *aContext)
// add addresses
iterator = OT_NETWORK_DATA_ITERATOR_INIT;
while (otGetNextOnMeshPrefix(false, &iterator, &config) == kThreadError_None)
while (otGetNextOnMeshPrefix(mInstance, false, &iterator, &config) == kThreadError_None)
{
bool found = false;
@@ -2115,14 +2125,13 @@ void Interpreter::HandleNetifStateChanged(uint32_t aFlags, void *aContext)
address->mPrefixLength = config.mPrefix.mLength;
address->mPreferredLifetime = config.mPreferred ? 0xffffffff : 0;
address->mValidLifetime = 0xffffffff;
otAddUnicastAddress(address);
otAddUnicastAddress(mInstance, address);
break;
}
}
}
exit:
(void)aContext;
return;
}
src/cli/cli.hpp
+85 -74
View File
@@ -53,6 +53,8 @@ namespace Thread {
*/
namespace Cli {
class Interpreter;
/**
* This structure represents a CLI command.
*
@@ -60,7 +62,7 @@ namespace Cli {
struct Command
{
const char *mName; ///< A pointer to the command string.
void (*mCommand)(int argc, char *argv[]); ///< A function pointer to process the command.
void (Interpreter::*mCommand)(int argc, char *argv[]); ///< A function pointer to process the command.
};
/**
@@ -70,11 +72,11 @@ struct Command
class Interpreter
{
public:
/**
* This method initializes the CLI interpreter.
*
* Constructor
*/
static void Init(void);
Interpreter(otInstance *aInstance);
/**
* This method interprets a CLI command.
@@ -84,7 +86,7 @@ public:
* @param[in] aServer A reference to the CLI server.
*
*/
static void ProcessLine(char *aBuf, uint16_t aBufLength, Server &aServer);
void ProcessLine(char *aBuf, uint16_t aBufLength, Server &aServer);
/**
* This method parses an ASCII string as a long.
@@ -127,88 +129,97 @@ private:
kMaxArgs = 32,
};
static void AppendResult(ThreadError error);
static void OutputBytes(const uint8_t *aBytes, uint8_t aLength);
void AppendResult(ThreadError error);
void OutputBytes(const uint8_t *aBytes, uint8_t aLength);
static void ProcessHelp(int argc, char *argv[]);
static void ProcessBlacklist(int argc, char *argv[]);
static void ProcessChannel(int argc, char *argv[]);
static void ProcessChild(int argc, char *argv[]);
static void ProcessChildTimeout(int argc, char *argv[]);
static void ProcessChildMax(int argc, char *argv[]);
void ProcessHelp(int argc, char *argv[]);
void ProcessBlacklist(int argc, char *argv[]);
void ProcessChannel(int argc, char *argv[]);
void ProcessChild(int argc, char *argv[]);
void ProcessChildTimeout(int argc, char *argv[]);
void ProcessChildMax(int argc, char *argv[]);
#if OPENTHREAD_ENABLE_COMMISSIONER
static void ProcessCommissioner(int argc, char *argv[]);
void ProcessCommissioner(int argc, char *argv[]);
#endif // OPENTHREAD_ENABLE_COMMISSIONER
static void ProcessContextIdReuseDelay(int argc, char *argv[]);
static void ProcessCounters(int argc, char *argv[]);
static void ProcessDataset(int argc, char *argv[]);
void ProcessContextIdReuseDelay(int argc, char *argv[]);
void ProcessCounters(int argc, char *argv[]);
void ProcessDataset(int argc, char *argv[]);
#if OPENTHREAD_ENABLE_DIAG
static void ProcessDiag(int argc, char *argv[]);
void ProcessDiag(int argc, char *argv[]);
#endif // OPENTHREAD_ENABLE_DIAG
static void ProcessDiscover(int argc, char *argv[]);
static void ProcessEidCache(int argc, char *argv[]);
void ProcessDiscover(int argc, char *argv[]);
void ProcessEidCache(int argc, char *argv[]);
#ifdef OPENTHREAD_EXAMPLES_POSIX
static void ProcessExit(int argc, char *argv[]);
void ProcessExit(int argc, char *argv[]);
#endif
static void ProcessExtAddress(int argc, char *argv[]);
static void ProcessExtPanId(int argc, char *argv[]);
static void ProcessIfconfig(int argc, char *argv[]);
static void ProcessIpAddr(int argc, char *argv[]);
static ThreadError ProcessIpAddrAdd(int argc, char *argv[]);
static ThreadError ProcessIpAddrDel(int argc, char *argv[]);
void ProcessExtAddress(int argc, char *argv[]);
void ProcessExtPanId(int argc, char *argv[]);
void ProcessIfconfig(int argc, char *argv[]);
void ProcessIpAddr(int argc, char *argv[]);
ThreadError ProcessIpAddrAdd(int argc, char *argv[]);
ThreadError ProcessIpAddrDel(int argc, char *argv[]);
#if OPENTHREAD_ENABLE_JOINER
static void ProcessJoiner(int argc, char *argv[]);
void ProcessJoiner(int argc, char *argv[]);
#endif // OPENTHREAD_ENABLE_JOINER
static void ProcessKeySequence(int argc, char *argv[]);
static void ProcessLeaderData(int argc, char *argv[]);
static void ProcessLeaderPartitionId(int argc, char *argv[]);
static void ProcessLeaderWeight(int argc, char *argv[]);
static void ProcessLinkQuality(int argc, char *argv[]);
static void ProcessMasterKey(int argc, char *argv[]);
static void ProcessMode(int argc, char *argv[]);
static void ProcessNetworkDataRegister(int argc, char *argv[]);
static void ProcessNetworkIdTimeout(int argc, char *argv[]);
static void ProcessNetworkName(int argc, char *argv[]);
static void ProcessPanId(int argc, char *argv[]);
static void ProcessParent(int argc, char *argv[]);
static void ProcessPing(int argc, char *argv[]);
static void ProcessPollPeriod(int argc, char *argv[]);
static void ProcessPrefix(int argc, char *argv[]);
static ThreadError ProcessPrefixAdd(int argc, char *argv[]);
static ThreadError ProcessPrefixRemove(int argc, char *argv[]);
static ThreadError ProcessPrefixList(void);
static void ProcessPromiscuous(int argc, char *argv[]);
static void ProcessReleaseRouterId(int argc, char *argv[]);
static void ProcessReset(int argc, char *argv[]);
static void ProcessRoute(int argc, char *argv[]);
static void ProcessRouter(int argc, char *argv[]);
static void ProcessRouterRole(int argc, char *argv[]);
static ThreadError ProcessRouteAdd(int argc, char *argv[]);
static ThreadError ProcessRouteRemove(int argc, char *argv[]);
static void ProcessRouterUpgradeThreshold(int argc, char *argv[]);
static void ProcessRloc16(int argc, char *argv[]);
static void ProcessScan(int argc, char *argv[]);
static void ProcessSingleton(int argc, char *argv[]);
static void ProcessState(int argc, char *argv[]);
static void ProcessThread(int argc, char *argv[]);
static void ProcessVersion(int argc, char *argv[]);
static void ProcessWhitelist(int argc, char *argv[]);
void ProcessKeySequence(int argc, char *argv[]);
void ProcessLeaderData(int argc, char *argv[]);
void ProcessLeaderPartitionId(int argc, char *argv[]);
void ProcessLeaderWeight(int argc, char *argv[]);
void ProcessLinkQuality(int argc, char *argv[]);
void ProcessMasterKey(int argc, char *argv[]);
void ProcessMode(int argc, char *argv[]);
void ProcessNetworkDataRegister(int argc, char *argv[]);
void ProcessNetworkIdTimeout(int argc, char *argv[]);
void ProcessNetworkName(int argc, char *argv[]);
void ProcessPanId(int argc, char *argv[]);
void ProcessParent(int argc, char *argv[]);
void ProcessPing(int argc, char *argv[]);
void ProcessPollPeriod(int argc, char *argv[]);
void ProcessPrefix(int argc, char *argv[]);
ThreadError ProcessPrefixAdd(int argc, char *argv[]);
ThreadError ProcessPrefixRemove(int argc, char *argv[]);
ThreadError ProcessPrefixList(void);
void ProcessPromiscuous(int argc, char *argv[]);
void ProcessReleaseRouterId(int argc, char *argv[]);
void ProcessReset(int argc, char *argv[]);
void ProcessRoute(int argc, char *argv[]);
void ProcessRouter(int argc, char *argv[]);
void ProcessRouterRole(int argc, char *argv[]);
ThreadError ProcessRouteAdd(int argc, char *argv[]);
ThreadError ProcessRouteRemove(int argc, char *argv[]);
void ProcessRouterUpgradeThreshold(int argc, char *argv[]);
void ProcessRloc16(int argc, char *argv[]);
void ProcessScan(int argc, char *argv[]);
void ProcessSingleton(int argc, char *argv[]);
void ProcessState(int argc, char *argv[]);
void ProcessThread(int argc, char *argv[]);
void ProcessVersion(int argc, char *argv[]);
void ProcessWhitelist(int argc, char *argv[]);
static void HandleEchoResponse(void *aContext, Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
static void HandlePingTimer(void *aContext);
static void HandleActiveScanResult(otActiveScanResult *aResult, void *aContext);
static void HandleNetifStateChanged(uint32_t aFlags, void *aContext);
static void HandleLinkPcapReceive(const RadioPacket *aFrame, void *aContext);
static void s_HandleEchoResponse(void *aContext, Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
static void s_HandlePingTimer(void *aContext);
static void s_HandleActiveScanResult(otActiveScanResult *aResult, void *aContext);
static void s_HandleNetifStateChanged(uint32_t aFlags, void *aContext);
static void s_HandleLinkPcapReceive(const RadioPacket *aFrame, void *aContext);
void HandleEchoResponse(Message &aMessage, const Ip6::MessageInfo &aMessageInfo);
void HandlePingTimer();
void HandleActiveScanResult(otActiveScanResult *aResult);
void HandleNetifStateChanged(uint32_t aFlags);
void HandleLinkPcapReceive(const RadioPacket *aFrame);
static const struct Command sCommands[];
static Ip6::MessageInfo sMessageInfo;
static Server *sServer;
static uint8_t sEchoRequest[];
static uint16_t sLength;
static uint16_t sCount;
static uint32_t sInterval;
static Timer *sPingTimer;
Ip6::MessageInfo sMessageInfo;
Server *sServer;
uint16_t sLength;
uint16_t sCount;
uint32_t sInterval;
Timer sPingTimer;
otNetifAddress sAutoAddresses[8];
otInstance *mInstance;
};
} // namespace Cli
src/cli/cli_console.cpp
+6 -7
View File
@@ -47,13 +47,11 @@ static Console *sServer;
static otDEFINE_ALIGNED_VAR(sCliConsoleRaw, sizeof(Console), uint64_t);
extern "C" void otCliConsoleInit(otCliConsoleOutputCallback aCallback,
void *aContext)
extern "C" void otCliConsoleInit(otInstance *aInstance, otCliConsoleOutputCallback aCallback, void *aContext)
{
sServer = new(&sCliConsoleRaw) Console;
sServer = new(&sCliConsoleRaw) Console(aInstance);
sServer->SetOutputCallback(aCallback);
sServer->SetContext(aContext);
Interpreter::Init();
}
extern "C" void otCliConsoleInputLine(char *aBuf, uint16_t aBufLength)
@@ -61,8 +59,9 @@ extern "C" void otCliConsoleInputLine(char *aBuf, uint16_t aBufLength)
sServer->ReceiveTask(aBuf, aBufLength);
}
Console::Console(void)
: mCallback(NULL)
Console::Console(otInstance *aInstance)
: mCallback(NULL),
mInterpreter(aInstance)
{
}
@@ -79,7 +78,7 @@ void Console::SetOutputCallback(otCliConsoleOutputCallback aCallback)
void Console::ReceiveTask(char *aBuf, uint16_t aBufLength)
{
Interpreter::ProcessLine(aBuf, aBufLength, *this);
mInterpreter.ProcessLine(aBuf, aBufLength, *this);
}
int Console::Output(const char *aBuf, uint16_t aBufLength)
src/cli/cli_console.hpp
+9 -1
View File
@@ -48,7 +48,13 @@ namespace Cli {
class Console: public Server
{
public:
Console(void);
/**
* Constructor
*
* @param[in] aInstance The OpenThread instance structure.
*
*/
Console(otInstance *aInstance);
/**
* This method delivers raw characters to the client.
@@ -99,6 +105,8 @@ private:
otCliConsoleOutputCallback mCallback;
void *mContext;
Interpreter mInterpreter;
};
} // namespace Cli
src/cli/cli_dataset.cpp
+56 -28
View File
@@ -176,7 +176,7 @@ ThreadError Dataset::Print(otOperationalDataset &aDataset)
return kThreadError_None;
}
ThreadError Dataset::Process(int argc, char *argv[], Server &aServer)
ThreadError Dataset::Process(otInstance *aInstance, int argc, char *argv[], Server &aServer)
{
ThreadError error = kThreadError_None;
@@ -191,7 +191,7 @@ ThreadError Dataset::Process(int argc, char *argv[], Server &aServer)
{
if (strcmp(argv[0], sCommands[i].mName) == 0)
{
error = sCommands[i].mCommand(argc - 1, argv + 1);
error = sCommands[i].mCommand(aInstance, argc - 1, argv + 1);
break;
}
}
@@ -200,29 +200,30 @@ exit:
return error;
}
ThreadError Dataset::ProcessHelp(int argc, char *argv[])
ThreadError Dataset::ProcessHelp(otInstance *aInstance, int argc, char *argv[])
{
for (unsigned int i = 0; i < sizeof(sCommands) / sizeof(sCommands[0]); i++)
{
sServer->OutputFormat("%s\r\n", sCommands[i].mName);
}
(void)aInstance;
(void)argc;
(void)argv;
return kThreadError_None;
}
ThreadError Dataset::ProcessActive(int argc, char *argv[])
ThreadError Dataset::ProcessActive(otInstance *aInstance, int argc, char *argv[])
{
otOperationalDataset dataset;
otGetActiveDataset(&dataset);
otGetActiveDataset(aInstance, &dataset);
(void)argc;
(void)argv;
return Print(dataset);
}
ThreadError Dataset::ProcessActiveTimestamp(int argc, char *argv[])
ThreadError Dataset::ProcessActiveTimestamp(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
long value;
@@ -233,11 +234,13 @@ ThreadError Dataset::ProcessActiveTimestamp(int argc, char *argv[])
sDataset.mActiveTimestamp = static_cast<uint64_t>(value);
sDataset.mIsActiveTimestampSet = true;
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessChannel(int argc, char *argv[])
ThreadError Dataset::ProcessChannel(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
long value;
@@ -247,19 +250,22 @@ ThreadError Dataset::ProcessChannel(int argc, char *argv[])
sDataset.mChannel = static_cast<uint16_t>(value);
sDataset.mIsChannelSet = true;
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessClear(int argc, char *argv[])
ThreadError Dataset::ProcessClear(otInstance *aInstance, int argc, char *argv[])
{
memset(&sDataset, 0, sizeof(sDataset));
(void)aInstance;
(void)argc;
(void)argv;
return kThreadError_None;
}
ThreadError Dataset::ProcessCommit(int argc, char *argv[])
ThreadError Dataset::ProcessCommit(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
@@ -267,22 +273,24 @@ ThreadError Dataset::ProcessCommit(int argc, char *argv[])
if (strcmp(argv[0], "active") == 0)
{
SuccessOrExit(error = otSetActiveDataset(&sDataset));
SuccessOrExit(error = otSetActiveDataset(aInstance, &sDataset));
}
else if (strcmp(argv[0], "pending") == 0)
{
SuccessOrExit(error = otSetPendingDataset(&sDataset));
SuccessOrExit(error = otSetPendingDataset(aInstance, &sDataset));
}
else
{
ExitNow(error = kThreadError_Parse);
}
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessDelay(int argc, char *argv[])
ThreadError Dataset::ProcessDelay(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
long value;
@@ -292,11 +300,13 @@ ThreadError Dataset::ProcessDelay(int argc, char *argv[])
sDataset.mDelay = static_cast<uint32_t>(value);
sDataset.mIsDelaySet = true;
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessExtPanId(int argc, char *argv[])
ThreadError Dataset::ProcessExtPanId(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
uint8_t extPanId[OT_EXT_PAN_ID_SIZE];
@@ -307,11 +317,13 @@ ThreadError Dataset::ProcessExtPanId(int argc, char *argv[])
memcpy(sDataset.mExtendedPanId.m8, extPanId, sizeof(sDataset.mExtendedPanId));
sDataset.mIsExtendedPanIdSet = true;
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessMasterKey(int argc, char *argv[])
ThreadError Dataset::ProcessMasterKey(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
int keyLength;
@@ -324,11 +336,13 @@ ThreadError Dataset::ProcessMasterKey(int argc, char *argv[])
memcpy(sDataset.mMasterKey.m8, key, sizeof(sDataset.mMasterKey));
sDataset.mIsMasterKeySet = true;
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessMeshLocalPrefix(int argc, char *argv[])
ThreadError Dataset::ProcessMeshLocalPrefix(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
otIp6Address prefix;
@@ -339,11 +353,13 @@ ThreadError Dataset::ProcessMeshLocalPrefix(int argc, char *argv[])
memcpy(sDataset.mMeshLocalPrefix.m8, prefix.mFields.m8, sizeof(sDataset.mMeshLocalPrefix.m8));
sDataset.mIsMeshLocalPrefixSet = true;
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessNetworkName(int argc, char *argv[])
ThreadError Dataset::ProcessNetworkName(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
size_t length;
@@ -355,11 +371,13 @@ ThreadError Dataset::ProcessNetworkName(int argc, char *argv[])
memcpy(sDataset.mNetworkName.m8, argv[0], length);
sDataset.mIsNetworkNameSet = true;
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessPanId(int argc, char *argv[])
ThreadError Dataset::ProcessPanId(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
long value;
@@ -369,21 +387,23 @@ ThreadError Dataset::ProcessPanId(int argc, char *argv[])
sDataset.mPanId = static_cast<otPanId>(value);
sDataset.mIsPanIdSet = true;
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessPending(int argc, char *argv[])
ThreadError Dataset::ProcessPending(otInstance *aInstance, int argc, char *argv[])
{
otOperationalDataset dataset;
otGetPendingDataset(&dataset);
otGetPendingDataset(aInstance, &dataset);
(void)argc;
(void)argv;
return Print(dataset);
}
ThreadError Dataset::ProcessPendingTimestamp(int argc, char *argv[])
ThreadError Dataset::ProcessPendingTimestamp(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
long value;
@@ -393,11 +413,13 @@ ThreadError Dataset::ProcessPendingTimestamp(int argc, char *argv[])
sDataset.mPendingTimestamp = static_cast<uint64_t>(value);
sDataset.mIsPendingTimestampSet = true;
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessMgmtSetCommand(int argc, char *argv[])
ThreadError Dataset::ProcessMgmtSetCommand(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
otOperationalDataset dataset;
@@ -495,22 +517,24 @@ ThreadError Dataset::ProcessMgmtSetCommand(int argc, char *argv[])
if (strcmp(argv[0], "active") == 0)
{
SuccessOrExit(error = otSendActiveSet(&dataset, tlvs, static_cast<uint8_t>(length)));
SuccessOrExit(error = otSendActiveSet(aInstance, &dataset, tlvs, static_cast<uint8_t>(length)));
}
else if (strcmp(argv[0], "pending") == 0)
{
SuccessOrExit(error = otSendPendingSet(&dataset, tlvs, static_cast<uint8_t>(length)));
SuccessOrExit(error = otSendPendingSet(aInstance, &dataset, tlvs, static_cast<uint8_t>(length)));
}
else
{
ExitNow(error = kThreadError_Parse);
}
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessMgmtGetCommand(int argc, char *argv[])
ThreadError Dataset::ProcessMgmtGetCommand(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
otOperationalDataset dataset;
@@ -579,22 +603,24 @@ ThreadError Dataset::ProcessMgmtGetCommand(int argc, char *argv[])
if (strcmp(argv[0], "active") == 0)
{
SuccessOrExit(error = otSendActiveGet(tlvs, static_cast<uint8_t>(length)));
SuccessOrExit(error = otSendActiveGet(aInstance, tlvs, static_cast<uint8_t>(length)));
}
else if (strcmp(argv[0], "pending") == 0)
{
SuccessOrExit(error = otSendPendingGet(tlvs, static_cast<uint8_t>(length)));
SuccessOrExit(error = otSendPendingGet(aInstance, tlvs, static_cast<uint8_t>(length)));
}
else
{
ExitNow(error = kThreadError_Parse);
}
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessPSKc(int argc, char *argv[])
ThreadError Dataset::ProcessPSKc(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
uint16_t length;
@@ -607,12 +633,13 @@ ThreadError Dataset::ProcessPSKc(int argc, char *argv[])
== length, error = kThreadError_Parse);
sDataset.mIsPSKcSet = true;
(void)aInstance;
exit:
return error;
}
ThreadError Dataset::ProcessSecurityPolicy(int argc, char *argv[])
ThreadError Dataset::ProcessSecurityPolicy(otInstance *aInstance, int argc, char *argv[])
{
ThreadError error = kThreadError_None;
long value;
@@ -656,6 +683,7 @@ ThreadError Dataset::ProcessSecurityPolicy(int argc, char *argv[])
}
sDataset.mIsSecurityPolicySet = true;
(void)aInstance;
exit:
return error;
src/cli/cli_dataset.hpp
+22 -21
View File
@@ -48,8 +48,9 @@ namespace Cli {
*/
struct DatasetCommand
{
const char *mName; ///< A pointer to the command string.
ThreadError(*mCommand)(int argc, char *argv[]); ///< A function pointer to process the command.
const char *mName; ///< A pointer to the command string.
ThreadError(*mCommand)(otInstance *aInstance, int argc,
char *argv[]); ///< A function pointer to process the command.
};
/**
@@ -66,30 +67,30 @@ public:
* @param[in] argv A pointer to an array of command line arguments.
*
*/
static ThreadError Process(int argc, char *argv[], Server &aServer);
static ThreadError Process(otInstance *aInstance, int argc, char *argv[], Server &aServer);
private:
static void OutputBytes(const uint8_t *aBytes, uint8_t aLength);
static ThreadError Print(otOperationalDataset &aDataset);
static ThreadError ProcessHelp(int argc, char *argv[]);
static ThreadError ProcessActive(int argc, char *argv[]);
static ThreadError ProcessActiveTimestamp(int argc, char *argv[]);
static ThreadError ProcessChannel(int argc, char *argv[]);
static ThreadError ProcessClear(int argc, char *argv[]);
static ThreadError ProcessCommit(int argc, char *argv[]);
static ThreadError ProcessDelay(int argc, char *argv[]);
static ThreadError ProcessExtPanId(int argc, char *argv[]);
static ThreadError ProcessMasterKey(int argc, char *argv[]);
static ThreadError ProcessMeshLocalPrefix(int argc, char *argv[]);
static ThreadError ProcessNetworkName(int argc, char *argv[]);
static ThreadError ProcessPanId(int argc, char *argv[]);
static ThreadError ProcessPending(int argc, char *argv[]);
static ThreadError ProcessPendingTimestamp(int argc, char *argv[]);
static ThreadError ProcessMgmtSetCommand(int argc, char *argv[]);
static ThreadError ProcessMgmtGetCommand(int argc, char *argv[]);
static ThreadError ProcessPSKc(int argc, char *argv[]);
static ThreadError ProcessSecurityPolicy(int argc, char *argv[]);
static ThreadError ProcessHelp(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessActive(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessActiveTimestamp(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessChannel(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessClear(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessCommit(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessDelay(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessExtPanId(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessMasterKey(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessMeshLocalPrefix(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessNetworkName(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessPanId(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessPending(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessPendingTimestamp(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessMgmtSetCommand(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessMgmtGetCommand(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessPSKc(otInstance *aInstance, int argc, char *argv[]);
static ThreadError ProcessSecurityPolicy(otInstance *aInstance, int argc, char *argv[]);
static const DatasetCommand sCommands[];
static otOperationalDataset sDataset;
src/cli/cli_uart.cpp
+8 -8
View File
@@ -51,17 +51,17 @@ namespace Cli {
static const char sCommandPrompt[] = {'>', ' '};
static const char sEraseString[] = {'\b', ' ', '\b'};
static const char CRNL[] = {'\r', '\n'};
static Uart *sServer;
Uart *Uart::sUartServer;
static otDEFINE_ALIGNED_VAR(sCliUartRaw, sizeof(Uart), uint64_t);
extern "C" void otCliUartInit(void)
extern "C" void otCliUartInit(otInstance *aInstance)
{
sServer = new(&sCliUartRaw) Uart;
Interpreter::Init();
Uart::sUartServer = new(&sCliUartRaw) Uart(aInstance);
}
Uart::Uart(void)
Uart::Uart(otInstance *aInstance):
mInterpreter(aInstance)
{
mRxLength = 0;
mTxHead = 0;
@@ -71,7 +71,7 @@ Uart::Uart(void)
extern "C" void otPlatUartReceived(const uint8_t *aBuf, uint16_t aBufLength)
{
sServer->ReceiveTask(aBuf, aBufLength);
Uart::sUartServer->ReceiveTask(aBuf, aBufLength);
}
void Uart::ReceiveTask(const uint8_t *aBuf, uint16_t aBufLength)
@@ -137,7 +137,7 @@ ThreadError Uart::ProcessCommand(void)
mRxBuffer[--mRxLength] = '\0';
}
Interpreter::ProcessLine(mRxBuffer, mRxLength, *this);
mInterpreter.ProcessLine(mRxBuffer, mRxLength, *this);
mRxLength = 0;
@@ -202,7 +202,7 @@ exit:
extern "C" void otPlatUartSendDone(void)
{
sServer->SendDoneTask();
Uart::sUartServer->SendDoneTask();
}
void Uart::SendDoneTask(void)
src/cli/cli_uart.hpp
+13 -1
View File
@@ -48,7 +48,13 @@ namespace Cli {
class Uart: public Server
{
public:
Uart(void);
/**
* Constructor
*
* @param[in] aInstance The OpenThread instance structure.
*
*/
Uart(otInstance *aInstance);
/**
* This method delivers raw characters to the client.
@@ -75,6 +81,8 @@ public:
void ReceiveTask(const uint8_t *aBuf, uint16_t aBufLength);
void SendDoneTask(void);
static Uart *sUartServer;
private:
enum
{
@@ -94,6 +102,10 @@ private:
uint16_t mTxLength;
uint16_t mSendLength;
Interpreter mInterpreter;
friend class Interpreter;
};
} // namespace Cli
src/cli/cli_udp.cpp
+9 -3
View File
@@ -42,6 +42,12 @@
namespace Thread {
namespace Cli {
Udp::Udp(otInstance *aInstance, Interpreter *aInterpreter):
mInstance(aInstance),
mInterpreter(aInterpreter)
{
}
ThreadError Udp::Start(void)
{
ThreadError error;
@@ -50,7 +56,7 @@ ThreadError Udp::Start(void)
memset(&sockaddr, 0, sizeof(otSockAddr));
sockaddr.mPort = 7335;
SuccessOrExit(error = otOpenUdpSocket(&mSocket, &HandleUdpReceive, this));
SuccessOrExit(error = otOpenUdpSocket(mInstance, &mSocket, &Udp::HandleUdpReceive, this));
SuccessOrExit(error = otBindUdpSocket(&mSocket, &sockaddr));
exit:
@@ -83,7 +89,7 @@ void Udp::HandleUdpReceive(otMessage aMessage, const otMessageInfo *aMessageInfo
mPeer = *aMessageInfo;
Interpreter::ProcessLine(buf, payloadLength, *this);
mInterpreter->ProcessLine(buf, payloadLength, *this);
exit:
{}
@@ -94,7 +100,7 @@ int Udp::Output(const char *aBuf, uint16_t aBufLength)
ThreadError error = kThreadError_None;
otMessage message;
VerifyOrExit((message = otNewUdpMessage()) != NULL, error = kThreadError_NoBufs);
VerifyOrExit((message = otNewUdpMessage(mInstance)) != NULL, error = kThreadError_NoBufs);
SuccessOrExit(error = otSetMessageLength(message, aBufLength));
otWriteMessage(message, 0, aBuf, aBufLength);
SuccessOrExit(error = otSendUdp(&mSocket, message, &mPeer));
src/cli/cli_udp.hpp
+11
View File
@@ -47,6 +47,15 @@ namespace Cli {
class Udp: public Server
{
public:
/**
* Constructor
*
* @param[in] aInstance The OpenThread instance structure.
* @param[in] aInterpreter The Interpreter structure.
*
*/
Udp(otInstance *aInstance, Interpreter *aInterpreter);
/**
* This method starts the CLI server.
*
@@ -88,6 +97,8 @@ private:
otUdpSocket mSocket;
otMessageInfo mPeer;
otInstance *mInstance;
Interpreter *mInterpreter;
};
} // namespace Cli