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

[cli] add new helper 'ParseIp6Prefix()' (#5603)

Browse Source
This commit is contained in:
Abtin Keshavarzian
2020-10-03 08:28:13 -07:00
committed by GitHub
parent 4db030c6c9
commit 0becde2952
2 changed files with 25 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli.cpp
+24 -72
View File
@@ -277,6 +277,26 @@ exit:
return error;
}
otError Interpreter::ParseIp6Prefix(char *aString, otIp6Prefix &aPrefix)
{
otError error = OT_ERROR_NONE;
char * prefixLengthStr;
unsigned long length;
prefixLengthStr = strchr(aString, '/');
VerifyOrExit(prefixLengthStr != nullptr, error = OT_ERROR_INVALID_ARGS);
*prefixLengthStr++ = '\0';
SuccessOrExit(error = otIp6AddressFromString(aString, &aPrefix.mPrefix));
SuccessOrExit(error = ParseUnsignedLong(prefixLengthStr, length));
aPrefix.mLength = static_cast<uint8_t>(length);
exit:
return error;
}
otError Interpreter::ParsePingInterval(const char *aString, uint32_t &aInterval)
{
otError error = OT_ERROR_NONE;
@@ -2838,28 +2858,12 @@ otError Interpreter::ProcessPrefixAdd(uint8_t aArgsLength, char *aArgs[])
otError error = OT_ERROR_NONE;
otBorderRouterConfig config;
uint8_t argcur = 0;
char * prefixLengthStr;
VerifyOrExit(aArgsLength > 0, error = OT_ERROR_INVALID_ARGS);
memset(&config, 0, sizeof(otBorderRouterConfig));
if ((prefixLengthStr = strchr(aArgs[argcur], '/')) == nullptr)
{
ExitNow();
}
*prefixLengthStr++ = '\0';
SuccessOrExit(error = otIp6AddressFromString(aArgs[argcur], &config.mPrefix.mPrefix));
{
unsigned long length;
SuccessOrExit(error = ParseUnsignedLong(prefixLengthStr, length));
config.mPrefix.mLength = static_cast<uint8_t>(length);
}
SuccessOrExit(error = ParseIp6Prefix(aArgs[argcur], config.mPrefix));
argcur++;
for (; argcur < aArgsLength; argcur++)
@@ -2936,28 +2940,10 @@ otError Interpreter::ProcessPrefixRemove(uint8_t aArgsLength, char *aArgs[])
{
otError error = OT_ERROR_NONE;
otIp6Prefix prefix;
uint8_t argcur = 0;
char * prefixLengthStr;
VerifyOrExit(aArgsLength > 0, error = OT_ERROR_INVALID_ARGS);
memset(&prefix, 0, sizeof(otIp6Prefix));
if ((prefixLengthStr = strchr(aArgs[argcur], '/')) == nullptr)
{
ExitNow();
}
*prefixLengthStr++ = '\0';
SuccessOrExit(error = otIp6AddressFromString(aArgs[argcur], &prefix.mPrefix));
{
unsigned long length;
SuccessOrExit(error = ParseUnsignedLong(prefixLengthStr, length));
prefix.mLength = static_cast<uint8_t>(length);
}
SuccessOrExit(error = ParseIp6Prefix(aArgs[0], prefix));
error = otBorderRouterRemoveOnMeshPrefix(mInstance, &prefix);
@@ -3093,28 +3079,12 @@ otError Interpreter::ProcessRouteAdd(uint8_t aArgsLength, char *aArgs[])
otError error = OT_ERROR_NONE;
otExternalRouteConfig config;
uint8_t argcur = 0;
char * prefixLengthStr;
memset(&config, 0, sizeof(otExternalRouteConfig));
VerifyOrExit(aArgsLength > 0, error = OT_ERROR_INVALID_ARGS);
if ((prefixLengthStr = strchr(aArgs[argcur], '/')) == nullptr)
{
ExitNow();
}
*prefixLengthStr++ = '\0';
SuccessOrExit(error = otIp6AddressFromString(aArgs[argcur], &config.mPrefix.mPrefix));
{
unsigned long length;
SuccessOrExit(error = ParseUnsignedLong(prefixLengthStr, length));
config.mPrefix.mLength = static_cast<uint8_t>(length);
}
SuccessOrExit(error = ParseIp6Prefix(aArgs[argcur], config.mPrefix));
argcur++;
for (; argcur < aArgsLength; argcur++)
@@ -3151,28 +3121,10 @@ otError Interpreter::ProcessRouteRemove(uint8_t aArgsLength, char *aArgs[])
{
otError error = OT_ERROR_NONE;
otIp6Prefix prefix;
uint8_t argcur = 0;
char * prefixLengthStr;
memset(&prefix, 0, sizeof(otIp6Prefix));
VerifyOrExit(aArgsLength > 0, error = OT_ERROR_INVALID_ARGS);
if ((prefixLengthStr = strchr(aArgs[argcur], '/')) == nullptr)
{
ExitNow();
}
*prefixLengthStr++ = '\0';
SuccessOrExit(error = otIp6AddressFromString(aArgs[argcur], &prefix.mPrefix));
{
unsigned long length;
SuccessOrExit(error = ParseUnsignedLong(prefixLengthStr, length));
prefix.mLength = static_cast<uint8_t>(length);
}
SuccessOrExit(error = ParseIp6Prefix(aArgs[0], prefix));
error = otBorderRouterRemoveRoute(mInstance, &prefix);
src/cli/cli.hpp
+1
View File
@@ -296,6 +296,7 @@ private:
otError ParsePingInterval(const char *aString, uint32_t &aInterval);
static otError ParseJoinerDiscerner(char *aString, otJoinerDiscerner &aJoinerDiscerner);
static otError ParseIp6Prefix(char *aString, otIp6Prefix &aPrefix);
otError ProcessHelp(uint8_t aArgsLength, char *aArgs[]);
otError ProcessCcaThreshold(uint8_t aArgsLength, char *aArgs[]);