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

[cli] always output command result (#4556)

Browse Source 
Always output command result, i.e. "Done" on success, error message
otherwise.

Factory commands also follow the same pattern. Their existing error
messages are not removed for backward compatibility consideration.
This commit is contained in:
Yakun Xu
2020-02-20 03:44:42 +08:00
committed by GitHub
parent c8dff09d3a
commit aa62fd8f65
22 changed files with 129 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/cli.cpp
+26 -19
View File
@@ -430,6 +430,8 @@ void Interpreter::ProcessHelp(int argc, char *argv[])
{
mServer->OutputFormat("%s\r\n", mUserCommands[i].mName);
}
AppendResult(OT_ERROR_NONE);
}
void Interpreter::ProcessBufferInfo(int argc, char *argv[])
@@ -1023,10 +1025,11 @@ void Interpreter::ProcessDiscover(int argc, char *argv[])
mServer->OutputFormat("| J | Network Name | Extended PAN | PAN | MAC Address | Ch | dBm | LQI |\r\n");
mServer->OutputFormat("+---+------------------+------------------+------+------------------+----+-----+-----+\r\n");
return;
exit:
AppendResult(error);
if (error != OT_ERROR_NONE)
{
AppendResult(error);
}
}
#if OPENTHREAD_CONFIG_DNS_CLIENT_ENABLE
@@ -1106,10 +1109,8 @@ void Interpreter::HandleDnsResponse(const char *aHostname, const Ip6::Address *a
}
mServer->OutputFormat(" TTL: %d\r\n", aTtl);
}
else
{
AppendResult(aResult);
}
AppendResult(aResult);
mResolvingInProgress = false;
}
@@ -2087,10 +2088,7 @@ void Interpreter::ProcessPing(int argc, char *argv[])
SendPing();
exit:
if (error != OT_ERROR_NONE)
{
AppendResult(error);
}
AppendResult(error);
}
void Interpreter::HandlePingTimer(Timer &aTimer)
@@ -2511,7 +2509,7 @@ void Interpreter::ProcessRloc16(int argc, char *argv[])
OT_UNUSED_VARIABLE(argv);
mServer->OutputFormat("%04x\r\n", otThreadGetRloc16(mInstance));
mServer->OutputFormat("Done\r\n");
AppendResult(OT_ERROR_NONE);
}
#if OPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE
@@ -2903,10 +2901,11 @@ void Interpreter::ProcessScan(int argc, char *argv[])
&Interpreter::HandleActiveScanResult, this));
}
return;
exit:
AppendResult(error);
if (error != OT_ERROR_NONE)
{
AppendResult(error);
}
}
void Interpreter::HandleActiveScanResult(otActiveScanResult *aResult, void *aContext)
@@ -2918,7 +2917,7 @@ void Interpreter::HandleActiveScanResult(otActiveScanResult *aResult)
{
if (aResult == NULL)
{
mServer->OutputFormat("Done\r\n");
AppendResult(OT_ERROR_NONE);
ExitNow();
}
@@ -2949,7 +2948,7 @@ void Interpreter::HandleEnergyScanResult(otEnergyScanResult *aResult)
{
if (aResult == NULL)
{
mServer->OutputFormat("Done\r\n");
AppendResult(OT_ERROR_NONE);
ExitNow();
}
@@ -3047,6 +3046,8 @@ void Interpreter::HandleSntpResponse(uint64_t aTime, otError aResult)
}
mSntpQueryingInProgress = false;
AppendResult(OT_ERROR_NONE);
}
#endif
@@ -3602,12 +3603,16 @@ exit:
#if OPENTHREAD_CONFIG_DIAG_ENABLE
void Interpreter::ProcessDiag(int argc, char *argv[])
{
char output[OPENTHREAD_CONFIG_DIAG_OUTPUT_BUFFER_SIZE];
otError error;
char output[OPENTHREAD_CONFIG_DIAG_OUTPUT_BUFFER_SIZE];
// all diagnostics related features are processed within diagnostics module
output[0] = '\0';
output[sizeof(output) - 1] = '\0';
otDiagProcessCmd(mInstance, argc, argv, output, sizeof(output) - 1);
error = otDiagProcessCmd(mInstance, argc, argv, output, sizeof(output) - 1);
mServer->Output(output, static_cast<uint16_t>(strlen(output)));
AppendResult(error);
}
#endif
@@ -3738,6 +3743,8 @@ void Interpreter::HandleDiagnosticGetResponse(Message &aMessage, const Ip6::Mess
}
mServer->OutputFormat("\r\n");
AppendResult(OT_ERROR_NONE);
}
void Interpreter::SetUserCommands(const otCliCommand *aCommands, uint8_t aLength)