mirror of
https://github.com/espressif/openthread.git
synced 2026-08-12 21:57:47 +00:00
[cli] adding helper ProcessGet/Set() to handle simpler commands (#6700)
This commit adds a set of helper methods in `Cli` to process simple commands where we are getting and/or setting a single integral value. This replaces common pattern in processing of commands where if there are no arguments, we output the value we retrieve by calling a related getter OT API, otherwise we parse the argument (to get the proper `int` value) and call a related setter OT API. For example, for "channel" command, we use the `otLinkGetChannel()` as the getter and `otLinkSetChannel()` as setter.
This commit is contained in:
Abtin Keshavarzian
+53
-393
@@ -484,12 +484,7 @@ otError Interpreter::ProcessBackboneRouterMgmtMlr(uint8_t aArgsLength, Arg aArgs
|
||||
#if OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE
|
||||
else if (aArgs[0] == "response")
|
||||
{
|
||||
uint8_t status;
|
||||
|
||||
VerifyOrExit(aArgsLength == 2, error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint8(status));
|
||||
|
||||
otBackboneRouterConfigNextMulticastListenerRegistrationResponse(mInstance, status);
|
||||
error = ProcessSet(aArgsLength - 1, aArgs + 1, otBackboneRouterConfigNextMulticastListenerRegistrationResponse);
|
||||
}
|
||||
#endif
|
||||
else
|
||||
@@ -527,17 +522,8 @@ otError Interpreter::ProcessBackboneRouterLocal(uint8_t aArgsLength, Arg aArgs[]
|
||||
}
|
||||
else if (aArgs[0] == "jitter")
|
||||
{
|
||||
if (aArgsLength == 1)
|
||||
{
|
||||
OutputLine("%d", otBackboneRouterGetRegistrationJitter(mInstance));
|
||||
}
|
||||
else if (aArgsLength == 2)
|
||||
{
|
||||
uint8_t jitter;
|
||||
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint8(jitter));
|
||||
otBackboneRouterSetRegistrationJitter(mInstance, jitter);
|
||||
}
|
||||
error = ProcessGetSet(aArgsLength - 1, aArgs + 1, otBackboneRouterGetRegistrationJitter,
|
||||
otBackboneRouterSetRegistrationJitter);
|
||||
}
|
||||
else if (aArgs[0] == "register")
|
||||
{
|
||||
@@ -729,14 +715,13 @@ exit:
|
||||
|
||||
otError Interpreter::ProcessChannel(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
uint8_t channel;
|
||||
otError error;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otLinkGetChannel(mInstance));
|
||||
}
|
||||
else if (aArgs[0] == "supported")
|
||||
error = ProcessGetSet(aArgsLength, aArgs, otLinkGetChannel, otLinkSetChannel);
|
||||
|
||||
VerifyOrExit(error != OT_ERROR_NONE);
|
||||
|
||||
if (aArgs[0] == "supported")
|
||||
{
|
||||
OutputLine("0x%x", otPlatRadioGetSupportedChannelMask(mInstance));
|
||||
}
|
||||
@@ -761,7 +746,7 @@ otError Interpreter::ProcessChannel(uint8_t aArgsLength, Arg aArgs[])
|
||||
OutputLine("count: %u", otChannelMonitorGetSampleCount(mInstance));
|
||||
|
||||
OutputLine("occupancies:");
|
||||
for (channel = 0; channel < channelNum; channel++)
|
||||
for (uint8_t channel = 0; channel < channelNum; channel++)
|
||||
{
|
||||
uint32_t occupancy = 0;
|
||||
|
||||
@@ -815,9 +800,7 @@ otError Interpreter::ProcessChannel(uint8_t aArgsLength, Arg aArgs[])
|
||||
}
|
||||
else if (aArgs[1] == "change")
|
||||
{
|
||||
VerifyOrExit(aArgsLength > 2, error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[2].ParseAsUint8(channel));
|
||||
otChannelManagerRequestChannelChange(mInstance, channel);
|
||||
error = ProcessSet(aArgsLength - 2, &aArgs[2], otChannelManagerRequestChannelChange);
|
||||
}
|
||||
#if OPENTHREAD_CONFIG_CHANNEL_MONITOR_ENABLE
|
||||
else if (aArgs[1] == "select")
|
||||
@@ -839,55 +822,26 @@ otError Interpreter::ProcessChannel(uint8_t aArgsLength, Arg aArgs[])
|
||||
}
|
||||
else if (aArgs[1] == "delay")
|
||||
{
|
||||
uint8_t delay;
|
||||
|
||||
VerifyOrExit(aArgsLength > 2, error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[2].ParseAsUint8(delay));
|
||||
error = otChannelManagerSetDelay(mInstance, delay);
|
||||
error = ProcessSet(aArgsLength - 2, aArgs + 2, otChannelManagerSetDelay);
|
||||
}
|
||||
else if (aArgs[1] == "interval")
|
||||
{
|
||||
uint32_t interval;
|
||||
|
||||
VerifyOrExit(aArgsLength > 2, error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[2].ParseAsUint32(interval));
|
||||
error = otChannelManagerSetAutoChannelSelectionInterval(mInstance, interval);
|
||||
error = ProcessSet(aArgsLength - 2, aArgs + 2, otChannelManagerSetAutoChannelSelectionInterval);
|
||||
}
|
||||
else if (aArgs[1] == "supported")
|
||||
{
|
||||
uint32_t mask;
|
||||
|
||||
VerifyOrExit(aArgsLength > 2, error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[2].ParseAsUint32(mask));
|
||||
otChannelManagerSetSupportedChannels(mInstance, mask);
|
||||
error = ProcessSet(aArgsLength - 2, aArgs + 2, otChannelManagerSetSupportedChannels);
|
||||
}
|
||||
else if (aArgs[1] == "favored")
|
||||
{
|
||||
uint32_t mask;
|
||||
|
||||
VerifyOrExit(aArgsLength > 2, error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[2].ParseAsUint32(mask));
|
||||
otChannelManagerSetFavoredChannels(mInstance, mask);
|
||||
error = ProcessSet(aArgsLength - 2, aArgs + 2, otChannelManagerSetFavoredChannels);
|
||||
}
|
||||
else if (aArgs[1] == "threshold")
|
||||
{
|
||||
uint16_t threshold;
|
||||
|
||||
VerifyOrExit(aArgsLength > 2, error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[2].ParseAsUint16(threshold));
|
||||
otChannelManagerSetCcaFailureRateThreshold(mInstance, threshold);
|
||||
}
|
||||
else
|
||||
{
|
||||
ExitNow(error = OT_ERROR_INVALID_ARGS);
|
||||
error = ProcessSet(aArgsLength - 2, aArgs + 2, otChannelManagerSetCcaFailureRateThreshold);
|
||||
}
|
||||
}
|
||||
#endif // OPENTHREAD_CONFIG_CHANNEL_MANAGER_ENABLE && OPENTHREAD_FTD
|
||||
else
|
||||
{
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint8(channel));
|
||||
error = otLinkSetChannel(mInstance, channel);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
@@ -1036,101 +990,45 @@ otError Interpreter::ProcessChildIp(uint8_t aArgsLength, Arg aArgs[])
|
||||
}
|
||||
else if (aArgs[0] == "max")
|
||||
{
|
||||
if (aArgsLength == 1)
|
||||
{
|
||||
OutputLine("%d", otThreadGetMaxChildIpAddresses(mInstance));
|
||||
}
|
||||
#if OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE
|
||||
else if (aArgsLength == 2)
|
||||
{
|
||||
uint8_t maxIpAddresses;
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint8(maxIpAddresses));
|
||||
SuccessOrExit(error = otThreadSetMaxChildIpAddresses(mInstance, maxIpAddresses));
|
||||
}
|
||||
#if !OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE
|
||||
error = ProcessGet(aArgsLength - 1, otThreadGetMaxChildIpAddresses);
|
||||
#else
|
||||
error =
|
||||
ProcessGetSet(aArgsLength - 1, aArgs + 1, otThreadGetMaxChildIpAddresses, otThreadSetMaxChildIpAddresses);
|
||||
#endif
|
||||
else
|
||||
{
|
||||
error = OT_ERROR_INVALID_ARGS;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
error = OT_ERROR_INVALID_COMMAND;
|
||||
}
|
||||
|
||||
#if OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE
|
||||
exit:
|
||||
#endif
|
||||
return error;
|
||||
}
|
||||
|
||||
otError Interpreter::ProcessChildMax(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otThreadGetMaxAllowedChildren(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint16_t maxChildren;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint16(maxChildren));
|
||||
SuccessOrExit(error = otThreadSetMaxAllowedChildren(mInstance, maxChildren));
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessGetSet(aArgsLength, aArgs, otThreadGetMaxAllowedChildren, otThreadSetMaxAllowedChildren);
|
||||
}
|
||||
#endif // OPENTHREAD_FTD
|
||||
|
||||
#if OPENTHREAD_CONFIG_CHILD_SUPERVISION_ENABLE
|
||||
otError Interpreter::ProcessChildSupervision(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
uint16_t value;
|
||||
otError error = OT_ERROR_INVALID_ARGS;
|
||||
|
||||
VerifyOrExit(aArgsLength > 0, error = OT_ERROR_INVALID_ARGS);
|
||||
VerifyOrExit(aArgsLength > 0);
|
||||
|
||||
if (aArgs[0] == "checktimeout")
|
||||
{
|
||||
if (aArgsLength == 1)
|
||||
{
|
||||
OutputLine("%u", otChildSupervisionGetCheckTimeout(mInstance));
|
||||
}
|
||||
else if (aArgsLength == 2)
|
||||
{
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint16(value));
|
||||
otChildSupervisionSetCheckTimeout(mInstance, value);
|
||||
}
|
||||
else
|
||||
{
|
||||
ExitNow(error = OT_ERROR_INVALID_ARGS);
|
||||
}
|
||||
error = ProcessGetSet(aArgsLength - 1, aArgs + 1, otChildSupervisionGetCheckTimeout,
|
||||
otChildSupervisionSetCheckTimeout);
|
||||
}
|
||||
#if OPENTHREAD_FTD
|
||||
else if (aArgs[0] == "interval")
|
||||
{
|
||||
if (aArgsLength == 1)
|
||||
{
|
||||
OutputLine("%u", otChildSupervisionGetInterval(mInstance));
|
||||
}
|
||||
else if (aArgsLength == 2)
|
||||
{
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint16(value));
|
||||
otChildSupervisionSetInterval(mInstance, value);
|
||||
}
|
||||
else
|
||||
{
|
||||
ExitNow(error = OT_ERROR_INVALID_ARGS);
|
||||
}
|
||||
error = ProcessGetSet(aArgsLength - 1, aArgs + 1, otChildSupervisionGetInterval, otChildSupervisionSetInterval);
|
||||
}
|
||||
#endif
|
||||
else
|
||||
{
|
||||
ExitNow(error = OT_ERROR_INVALID_ARGS);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
@@ -1139,22 +1037,7 @@ exit:
|
||||
|
||||
otError Interpreter::ProcessChildTimeout(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otThreadGetChildTimeout(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint32_t timeout;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint32(timeout));
|
||||
otThreadSetChildTimeout(mInstance, timeout);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessGetSet(aArgsLength, aArgs, otThreadGetChildTimeout, otThreadSetChildTimeout);
|
||||
}
|
||||
|
||||
#if OPENTHREAD_CONFIG_COAP_API_ENABLE
|
||||
@@ -1249,22 +1132,7 @@ exit:
|
||||
#if OPENTHREAD_FTD
|
||||
otError Interpreter::ProcessContextIdReuseDelay(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otThreadGetContextIdReuseDelay(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint32_t delay;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint32(delay));
|
||||
otThreadSetContextIdReuseDelay(mInstance, delay);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessGetSet(aArgsLength, aArgs, otThreadGetContextIdReuseDelay, otThreadSetContextIdReuseDelay);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -1411,28 +1279,18 @@ otError Interpreter::ProcessCsl(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
if (aArgs[0] == "channel")
|
||||
{
|
||||
uint8_t channel;
|
||||
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint8(channel));
|
||||
SuccessOrExit(error = otLinkCslSetChannel(mInstance, channel));
|
||||
error = ProcessSet(aArgsLength - 1, aArgs + 1, otLinkCslSetChannel);
|
||||
}
|
||||
else if (aArgs[0] == "period")
|
||||
{
|
||||
uint16_t period;
|
||||
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint16(period));
|
||||
SuccessOrExit(error = otLinkCslSetPeriod(mInstance, period));
|
||||
error = ProcessSet(aArgsLength - 1, aArgs + 1, otLinkCslSetPeriod);
|
||||
}
|
||||
else if (aArgs[0] == "timeout")
|
||||
{
|
||||
uint32_t timeout;
|
||||
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint32(timeout));
|
||||
SuccessOrExit(error = otLinkCslSetTimeout(mInstance, timeout));
|
||||
error = ProcessSet(aArgsLength - 1, aArgs + 1, otLinkCslSetTimeout);
|
||||
}
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
#endif // OPENTHREAD_CONFIG_MAC_CSL_RECEIVER_ENABLE
|
||||
@@ -2245,31 +2103,11 @@ otError Interpreter::ProcessKeySequence(uint8_t aArgsLength, Arg aArgs[])
|
||||
|
||||
if (aArgs[0] == "counter")
|
||||
{
|
||||
if (aArgsLength == 1)
|
||||
{
|
||||
OutputLine("%d", otThreadGetKeySequenceCounter(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint32_t counter;
|
||||
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint32(counter));
|
||||
otThreadSetKeySequenceCounter(mInstance, counter);
|
||||
}
|
||||
error = ProcessGetSet(aArgsLength - 1, aArgs + 1, otThreadGetKeySequenceCounter, otThreadSetKeySequenceCounter);
|
||||
}
|
||||
else if (aArgs[0] == "guardtime")
|
||||
{
|
||||
if (aArgsLength == 1)
|
||||
{
|
||||
OutputLine("%d", otThreadGetKeySwitchGuardTime(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint32_t guardTime;
|
||||
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint32(guardTime));
|
||||
otThreadSetKeySwitchGuardTime(mInstance, guardTime);
|
||||
}
|
||||
error = ProcessGetSet(aArgsLength - 1, aArgs + 1, otThreadGetKeySwitchGuardTime, otThreadSetKeySwitchGuardTime);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2315,21 +2153,9 @@ otError Interpreter::ProcessPartitionId(uint8_t aArgsLength, Arg aArgs[])
|
||||
#if OPENTHREAD_CONFIG_REFERENCE_DEVICE_ENABLE
|
||||
else if (aArgs[0] == "preferred")
|
||||
{
|
||||
if (aArgsLength == 1)
|
||||
{
|
||||
OutputLine("%u", otThreadGetPreferredLeaderPartitionId(mInstance));
|
||||
error = OT_ERROR_NONE;
|
||||
}
|
||||
else if (aArgsLength == 2)
|
||||
{
|
||||
uint32_t partitionId;
|
||||
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint32(partitionId));
|
||||
otThreadSetPreferredLeaderPartitionId(mInstance, partitionId);
|
||||
}
|
||||
error = ProcessGetSet(aArgsLength - 1, aArgs + 1, otThreadGetPreferredLeaderPartitionId,
|
||||
otThreadSetPreferredLeaderPartitionId);
|
||||
}
|
||||
|
||||
exit:
|
||||
#endif
|
||||
|
||||
return error;
|
||||
@@ -2337,22 +2163,7 @@ exit:
|
||||
|
||||
otError Interpreter::ProcessLeaderWeight(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otThreadGetLocalLeaderWeight(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint8_t weight;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint8(weight));
|
||||
otThreadSetLocalLeaderWeight(mInstance, weight);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessGetSet(aArgsLength, aArgs, otThreadGetLocalLeaderWeight, otThreadSetLocalLeaderWeight);
|
||||
}
|
||||
#endif // OPENTHREAD_FTD
|
||||
|
||||
@@ -3167,22 +2978,7 @@ otError Interpreter::ProcessNetworkData(uint8_t aArgsLength, Arg aArgs[])
|
||||
#if OPENTHREAD_FTD
|
||||
otError Interpreter::ProcessNetworkIdTimeout(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otThreadGetNetworkIdTimeout(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint8_t timeout;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint8(timeout));
|
||||
otThreadSetNetworkIdTimeout(mInstance, timeout);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessGetSet(aArgsLength, aArgs, otThreadGetNetworkIdTimeout, otThreadSetNetworkIdTimeout);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -3268,13 +3064,9 @@ otError Interpreter::ProcessPanId(uint8_t aArgsLength, Arg aArgs[])
|
||||
}
|
||||
else
|
||||
{
|
||||
uint16_t panId;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint16(panId));
|
||||
error = otLinkSetPanId(mInstance, panId);
|
||||
error = ProcessSet(aArgsLength, aArgs, otLinkSetPanId);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
|
||||
@@ -3302,22 +3094,7 @@ exit:
|
||||
#if OPENTHREAD_FTD
|
||||
otError Interpreter::ProcessParentPriority(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otThreadGetParentPriority(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
int8_t priority;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsInt8(priority));
|
||||
error = otThreadSetParentPriority(mInstance, priority);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessGetSet(aArgsLength, aArgs, otThreadGetParentPriority, otThreadSetParentPriority);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -3454,22 +3231,7 @@ exit:
|
||||
|
||||
otError Interpreter::ProcessPollPeriod(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otLinkGetPollPeriod(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint32_t pollPeriod;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint32(pollPeriod));
|
||||
error = otLinkSetPollPeriod(mInstance, pollPeriod);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessGetSet(aArgsLength, aArgs, otLinkGetPollPeriod, otLinkSetPollPeriod);
|
||||
}
|
||||
|
||||
otError Interpreter::ProcessPromiscuous(uint8_t aArgsLength, Arg aArgs[])
|
||||
@@ -3733,15 +3495,7 @@ exit:
|
||||
#if OPENTHREAD_FTD
|
||||
otError Interpreter::ProcessPreferRouterId(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
uint8_t routerId;
|
||||
|
||||
VerifyOrExit(aArgsLength == 1, error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint8(routerId));
|
||||
error = otThreadSetPreferredRouterId(mInstance, routerId);
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessSet(aArgsLength, aArgs, otThreadSetPreferredRouterId);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -3792,16 +3546,7 @@ exit:
|
||||
#if OPENTHREAD_FTD
|
||||
otError Interpreter::ProcessReleaseRouterId(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
uint8_t routerId;
|
||||
|
||||
VerifyOrExit(aArgsLength > 0, error = OT_ERROR_INVALID_ARGS);
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint8(routerId));
|
||||
SuccessOrExit(error = otThreadReleaseRouterId(mInstance, routerId));
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessSet(aArgsLength, aArgs, otThreadReleaseRouterId);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -4018,22 +3763,7 @@ exit:
|
||||
|
||||
otError Interpreter::ProcessRouterDowngradeThreshold(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otThreadGetRouterDowngradeThreshold(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint8_t threshold;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint8(threshold));
|
||||
otThreadSetRouterDowngradeThreshold(mInstance, threshold);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessGetSet(aArgsLength, aArgs, otThreadGetRouterDowngradeThreshold, otThreadSetRouterDowngradeThreshold);
|
||||
}
|
||||
|
||||
otError Interpreter::ProcessRouterEligible(uint8_t aArgsLength, Arg aArgs[])
|
||||
@@ -4058,42 +3788,12 @@ exit:
|
||||
|
||||
otError Interpreter::ProcessRouterSelectionJitter(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otThreadGetRouterSelectionJitter(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint8_t jitter;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint8(jitter));
|
||||
otThreadSetRouterSelectionJitter(mInstance, jitter);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessGetSet(aArgsLength, aArgs, otThreadGetRouterSelectionJitter, otThreadSetRouterSelectionJitter);
|
||||
}
|
||||
|
||||
otError Interpreter::ProcessRouterUpgradeThreshold(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otThreadGetRouterUpgradeThreshold(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint8_t threshold;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint8(threshold));
|
||||
otThreadSetRouterUpgradeThreshold(mInstance, threshold);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessGetSet(aArgsLength, aArgs, otThreadGetRouterUpgradeThreshold, otThreadSetRouterUpgradeThreshold);
|
||||
}
|
||||
#endif // OPENTHREAD_FTD
|
||||
|
||||
@@ -4470,11 +4170,7 @@ otError Interpreter::ProcessUnsecurePort(uint8_t aArgsLength, Arg aArgs[])
|
||||
|
||||
if (aArgs[0] == "add")
|
||||
{
|
||||
uint16_t port;
|
||||
|
||||
VerifyOrExit(aArgsLength == 2, error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint16(port));
|
||||
SuccessOrExit(error = otIp6AddUnsecurePort(mInstance, port));
|
||||
error = ProcessSet(aArgsLength - 1, aArgs + 1, otIp6AddUnsecurePort);
|
||||
}
|
||||
else if (aArgs[0] == "remove")
|
||||
{
|
||||
@@ -4486,10 +4182,7 @@ otError Interpreter::ProcessUnsecurePort(uint8_t aArgsLength, Arg aArgs[])
|
||||
}
|
||||
else
|
||||
{
|
||||
uint16_t port;
|
||||
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint16(port));
|
||||
SuccessOrExit(error = otIp6RemoveUnsecurePort(mInstance, port));
|
||||
error = ProcessSet(aArgsLength - 1, aArgs + 1, otIp6RemoveUnsecurePort);
|
||||
}
|
||||
}
|
||||
else if (aArgs[0] == "get")
|
||||
@@ -4558,22 +4251,7 @@ otError Interpreter::ProcessJoiner(uint8_t aArgsLength, Arg aArgs[])
|
||||
#if OPENTHREAD_FTD
|
||||
otError Interpreter::ProcessJoinerPort(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
OutputLine("%d", otThreadGetJoinerUdpPort(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint16_t port;
|
||||
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint16(port));
|
||||
error = otThreadSetJoinerUdpPort(mInstance, port);
|
||||
}
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return ProcessGetSet(aArgsLength, aArgs, otThreadGetJoinerUdpPort, otThreadSetJoinerUdpPort);
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -4889,32 +4567,14 @@ otError Interpreter::ProcessMacRetries(uint8_t aArgsLength, Arg aArgs[])
|
||||
|
||||
if (aArgs[0] == "direct")
|
||||
{
|
||||
if (aArgsLength == 1)
|
||||
{
|
||||
OutputLine("%d", otLinkGetMaxFrameRetriesDirect(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint8_t retries;
|
||||
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint8(retries));
|
||||
otLinkSetMaxFrameRetriesDirect(mInstance, retries);
|
||||
}
|
||||
error =
|
||||
ProcessGetSet(aArgsLength - 1, aArgs + 1, otLinkGetMaxFrameRetriesDirect, otLinkSetMaxFrameRetriesDirect);
|
||||
}
|
||||
#if OPENTHREAD_FTD
|
||||
else if (aArgs[0] == "indirect")
|
||||
{
|
||||
if (aArgsLength == 1)
|
||||
{
|
||||
OutputLine("%d", otLinkGetMaxFrameRetriesIndirect(mInstance));
|
||||
}
|
||||
else
|
||||
{
|
||||
uint8_t retries;
|
||||
|
||||
SuccessOrExit(error = aArgs[1].ParseAsUint8(retries));
|
||||
otLinkSetMaxFrameRetriesIndirect(mInstance, retries);
|
||||
}
|
||||
error = ProcessGetSet(aArgsLength - 1, aArgs + 1, otLinkGetMaxFrameRetriesIndirect,
|
||||
otLinkSetMaxFrameRetriesIndirect);
|
||||
}
|
||||
#endif
|
||||
else
|
||||
|
||||
+124
@@ -68,6 +68,7 @@
|
||||
#include "common/code_utils.hpp"
|
||||
#include "common/debug.hpp"
|
||||
#include "common/instance.hpp"
|
||||
#include "common/type_traits.hpp"
|
||||
#include "utils/lookup_table.hpp"
|
||||
#include "utils/parse_cmdline.hpp"
|
||||
|
||||
@@ -313,6 +314,97 @@ private:
|
||||
otError (Interpreter::*mHandler)(uint8_t aArgsLength, Arg aArgs[]);
|
||||
};
|
||||
|
||||
template <typename ValueType> using GetHandler = ValueType (&)(otInstance *);
|
||||
template <typename ValueType> using SetHandler = void (&)(otInstance *, ValueType);
|
||||
template <typename ValueType> using SetHandlerFailable = otError (&)(otInstance *, ValueType);
|
||||
|
||||
// Returns format string to output a `ValueType` (e.g., "%u" for `uint16_t`).
|
||||
template <typename ValueType> static constexpr const char *FormatStringFor(void);
|
||||
|
||||
template <typename ValueType> otError ProcessGet(uint8_t aArgsLength, GetHandler<ValueType> aGetHandler)
|
||||
{
|
||||
static_assert(
|
||||
TypeTraits::IsSame<ValueType, uint8_t>::kValue || TypeTraits::IsSame<ValueType, uint16_t>::kValue ||
|
||||
TypeTraits::IsSame<ValueType, uint32_t>::kValue || TypeTraits::IsSame<ValueType, int8_t>::kValue ||
|
||||
TypeTraits::IsSame<ValueType, int16_t>::kValue || TypeTraits::IsSame<ValueType, int32_t>::kValue,
|
||||
"ValueType must be an 8, 16, or 32 bit `int` or `uint` type");
|
||||
|
||||
otError error = OT_ERROR_NONE;
|
||||
|
||||
VerifyOrExit(aArgsLength == 0, error = OT_ERROR_INVALID_ARGS);
|
||||
OutputLine(FormatStringFor<ValueType>(), aGetHandler(mInstance));
|
||||
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
|
||||
template <typename ValueType> otError ParseValue(uint8_t aArgsLength, Arg aArgs[], ValueType &aValue)
|
||||
{
|
||||
otError error = OT_ERROR_INVALID_ARGS;
|
||||
|
||||
VerifyOrExit(aArgsLength == 1);
|
||||
error = aArgs[0].ParseAs<ValueType>(aValue);
|
||||
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
|
||||
template <typename ValueType>
|
||||
otError ProcessSet(uint8_t aArgsLength, Arg aArgs[], SetHandler<ValueType> aSetHandler)
|
||||
{
|
||||
otError error;
|
||||
ValueType value;
|
||||
|
||||
SuccessOrExit(error = ParseValue(aArgsLength, aArgs, value));
|
||||
aSetHandler(mInstance, value);
|
||||
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
|
||||
template <typename ValueType>
|
||||
otError ProcessSet(uint8_t aArgsLength, Arg aArgs[], SetHandlerFailable<ValueType> aSetHandler)
|
||||
{
|
||||
otError error;
|
||||
ValueType value;
|
||||
|
||||
SuccessOrExit(error = ParseValue(aArgsLength, aArgs, value));
|
||||
error = aSetHandler(mInstance, value);
|
||||
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
|
||||
template <typename ValueType>
|
||||
otError ProcessGetSet(uint8_t aArgsLength,
|
||||
Arg aArgs[],
|
||||
GetHandler<ValueType> aGetHandler,
|
||||
SetHandler<ValueType> aSetHandler)
|
||||
{
|
||||
otError error = ProcessGet(aArgsLength, aGetHandler);
|
||||
|
||||
VerifyOrExit(error != OT_ERROR_NONE);
|
||||
error = ProcessSet(aArgsLength, aArgs, aSetHandler);
|
||||
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
|
||||
template <typename ValueType>
|
||||
otError ProcessGetSet(uint8_t aArgsLength,
|
||||
Arg aArgs[],
|
||||
GetHandler<ValueType> aGetHandler,
|
||||
SetHandlerFailable<ValueType> aSetHandler)
|
||||
{
|
||||
otError error = ProcessGet(aArgsLength, aGetHandler);
|
||||
|
||||
VerifyOrExit(error != OT_ERROR_NONE);
|
||||
error = ProcessSet(aArgsLength, aArgs, aSetHandler);
|
||||
|
||||
exit:
|
||||
return error;
|
||||
}
|
||||
|
||||
void OutputTableHeader(uint8_t aNumColumns, const char *const aTitles[], const uint8_t aWidths[]);
|
||||
|
||||
template <uint8_t kTableNumColumns>
|
||||
@@ -848,6 +940,38 @@ private:
|
||||
#endif
|
||||
};
|
||||
|
||||
// Specializations of `FormatStringFor<ValueType>()`
|
||||
|
||||
template <> inline constexpr const char *Interpreter::FormatStringFor<uint8_t>(void)
|
||||
{
|
||||
return "%u";
|
||||
}
|
||||
|
||||
template <> inline constexpr const char *Interpreter::FormatStringFor<uint16_t>(void)
|
||||
{
|
||||
return "%u";
|
||||
}
|
||||
|
||||
template <> inline constexpr const char *Interpreter::FormatStringFor<uint32_t>(void)
|
||||
{
|
||||
return "%u";
|
||||
}
|
||||
|
||||
template <> inline constexpr const char *Interpreter::FormatStringFor<int8_t>(void)
|
||||
{
|
||||
return "%d";
|
||||
}
|
||||
|
||||
template <> inline constexpr const char *Interpreter::FormatStringFor<int16_t>(void)
|
||||
{
|
||||
return "%d";
|
||||
}
|
||||
|
||||
template <> inline constexpr const char *Interpreter::FormatStringFor<int32_t>(void)
|
||||
{
|
||||
return "%d";
|
||||
}
|
||||
|
||||
} // namespace Cli
|
||||
} // namespace ot
|
||||
|
||||
|
||||
@@ -260,40 +260,13 @@ exit:
|
||||
|
||||
otError SrpClient::ProcessLeaseInterval(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
uint32_t interval;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
mInterpreter.OutputLine("%u", otSrpClientGetLeaseInterval(mInterpreter.mInstance));
|
||||
ExitNow();
|
||||
}
|
||||
|
||||
VerifyOrExit(aArgsLength == 1, error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint32(interval));
|
||||
otSrpClientSetLeaseInterval(mInterpreter.mInstance, interval);
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return mInterpreter.ProcessGetSet(aArgsLength, aArgs, otSrpClientGetLeaseInterval, otSrpClientSetLeaseInterval);
|
||||
}
|
||||
|
||||
otError SrpClient::ProcessKeyLeaseInterval(uint8_t aArgsLength, Arg aArgs[])
|
||||
{
|
||||
otError error = OT_ERROR_NONE;
|
||||
uint32_t interval;
|
||||
|
||||
if (aArgsLength == 0)
|
||||
{
|
||||
mInterpreter.OutputLine("%u", otSrpClientGetKeyLeaseInterval(mInterpreter.mInstance));
|
||||
ExitNow();
|
||||
}
|
||||
|
||||
VerifyOrExit(aArgsLength == 1, error = OT_ERROR_INVALID_ARGS);
|
||||
SuccessOrExit(error = aArgs[0].ParseAsUint32(interval));
|
||||
otSrpClientSetKeyLeaseInterval(mInterpreter.mInstance, interval);
|
||||
|
||||
exit:
|
||||
return error;
|
||||
return mInterpreter.ProcessGetSet(aArgsLength, aArgs, otSrpClientGetKeyLeaseInterval,
|
||||
otSrpClientSetKeyLeaseInterval);
|
||||
}
|
||||
|
||||
otError SrpClient::ProcessServer(uint8_t aArgsLength, Arg aArgs[])
|
||||
|
||||
@@ -468,6 +468,19 @@ public:
|
||||
|
||||
#endif // OPENTHREAD_FTD || OPENTHREAD_MTD
|
||||
|
||||
/**
|
||||
* This template method parses the argument as a specified value type.
|
||||
*
|
||||
* @tparam Type The value type.
|
||||
*
|
||||
* @param[out] aValue A reference to output the parsed value.
|
||||
*
|
||||
* @retval kErrorNone The argument was parsed successfully.
|
||||
* @retval kErrorInvalidArgs The argument does not contain a valid value.
|
||||
*
|
||||
*/
|
||||
template <typename Type> otError ParseAs(Type &aValue) const;
|
||||
|
||||
/**
|
||||
* This method parses the argument as a hex string into a byte array of fixed expected size.
|
||||
*
|
||||
@@ -562,6 +575,63 @@ private:
|
||||
*/
|
||||
otError ParseCmd(char *aCommandString, uint8_t &aArgsLength, Arg aArgs[], uint8_t aArgsLengthMax);
|
||||
|
||||
//- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
// Specializations of `Arg::ParseAs<Type>()` method.
|
||||
|
||||
template <> inline otError Arg::ParseAs(uint8_t &aValue) const
|
||||
{
|
||||
return ParseAsUint8(aValue);
|
||||
}
|
||||
|
||||
template <> inline otError Arg::ParseAs(uint16_t &aValue) const
|
||||
{
|
||||
return ParseAsUint16(aValue);
|
||||
}
|
||||
|
||||
template <> inline otError Arg::ParseAs(uint32_t &aValue) const
|
||||
{
|
||||
return ParseAsUint32(aValue);
|
||||
}
|
||||
|
||||
template <> inline otError Arg::ParseAs(uint64_t &aValue) const
|
||||
{
|
||||
return ParseAsUint64(aValue);
|
||||
}
|
||||
|
||||
template <> inline otError Arg::ParseAs(bool &aValue) const
|
||||
{
|
||||
return ParseAsBool(aValue);
|
||||
}
|
||||
|
||||
template <> inline otError Arg::ParseAs(int8_t &aValue) const
|
||||
{
|
||||
return ParseAsInt8(aValue);
|
||||
}
|
||||
|
||||
template <> inline otError Arg::ParseAs(int16_t &aValue) const
|
||||
{
|
||||
return ParseAsInt16(aValue);
|
||||
}
|
||||
|
||||
template <> inline otError Arg::ParseAs(int32_t &aValue) const
|
||||
{
|
||||
return ParseAsInt32(aValue);
|
||||
}
|
||||
|
||||
#if OPENTHREAD_FTD || OPENTHREAD_MTD
|
||||
|
||||
template <> inline otError Arg::ParseAs(otIp6Address &aValue) const
|
||||
{
|
||||
return ParseAsIp6Address(aValue);
|
||||
}
|
||||
|
||||
template <> inline otError Arg::ParseAs(otIp6Prefix &aValue) const
|
||||
{
|
||||
return ParseAsIp6Prefix(aValue);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user