espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-06 18:57:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ot-ctl] send a line at once (#6333)

Browse Source 
Calling write multiple times may casing different arguments of a
command line reach to the daemon at different times. This commit
composes arguments into a full command line and sends it at once.
This commit is contained in:
Yakun Xu
2021-03-24 19:07:15 -07:00
committed by GitHub
parent 5911ae9db1
commit f8bc783c2f
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/posix/client.cpp
+22 -12
View File
@@ -28,6 +28,8 @@
#include "platform/openthread-posix-config.h"
#include "cli/cli_config.h"
#include <openthread/platform/toolchain.h>
#ifndef HAVE_LIBEDIT
@@ -62,7 +64,7 @@
enum
{
kLineBufferSize = 256,
kLineBufferSize = OPENTHREAD_CONFIG_CLI_MAX_LINE_LENGTH,
};
static_assert(kLineBufferSize >= sizeof("> "), "kLineBufferSize is too small");
@@ -161,23 +163,28 @@ exit:
int main(int argc, char *argv[])
{
int ret;
bool isInteractive = true;
bool isFinished = false;
char lineBuffer[kLineBufferSize];
size_t lineBufferWritePos = 0;
bool isBeginOfLine = true;
int ret;
bool isInteractive = true;
bool isFinished = false;
VerifyOrExit(ConnectSession() != -1, perror("connect session failed"); ret = OT_EXIT_FAILURE);
if (argc > 1)
{
char buffer[kLineBufferSize];
size_t count = 0;
for (int i = 1; i < argc; i++)
{
VerifyOrExit(DoWrite(sSessionFd, argv[i], strlen(argv[i])), ret = OT_EXIT_FAILURE);
VerifyOrExit(DoWrite(sSessionFd, " ", 1), ret = OT_EXIT_FAILURE);
int rval = snprintf(&buffer[count], (sizeof(buffer) - count), "%s ", argv[i]);
VerifyOrExit(rval > 0 && static_cast<size_t>(rval) < (sizeof(buffer) - count), ret = OT_EXIT_FAILURE);
count += static_cast<size_t>(rval);
}
VerifyOrExit(DoWrite(sSessionFd, "\n", 1), ret = OT_EXIT_FAILURE);
// replace the trailing space with newline
buffer[count - 1] = '\n';
VerifyOrExit(DoWrite(sSessionFd, buffer, count), ret = OT_EXIT_FAILURE);
isInteractive = false;
}
@@ -195,8 +202,11 @@ int main(int argc, char *argv[])
while (!isFinished)
{
fd_set readFdSet;
char buffer[OPENTHREAD_CONFIG_DIAG_CMD_LINE_BUFFER_SIZE];
int maxFd = sSessionFd;
char lineBuffer[kLineBufferSize];
char buffer[kLineBufferSize];
size_t lineBufferWritePos = 0;
bool isBeginOfLine = true;
int maxFd = sSessionFd;
FD_ZERO(&readFdSet);