sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ymodem:fix ymodem bug

Browse Source 
1.Timeout processing
2.clear error count when received successfully once
3.fix the bug of insufficient header memory application

Signed-off-by: anjiahao <anjiahao@xiaomi.com>
This commit is contained in:
anjiahao 2023-05-15 17:24:05 +08:00 committed by Xiang Xiao
parent fb7dafc7e0
commit 8fd4b4d45b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
system/ymodem/ymodem.c
View File

@ -215,6 +215,7 @@ recv_packet:
{
/* other errors, like ETIMEDOUT, EILSEQ, EBADMSG... */
tcflush(ctx->recvfd, TCIOFLUSH);
if (++retries > MAX_RETRIES)
{
ymodem_debug("recv_file: too many errors, cancel!!\n");
@ -295,6 +296,7 @@ recv_packet:
ctx->header[0] = ACK;
total_seq++;
ymodem_debug("recv_file: recv data success\n");
retries = 0;
goto recv_packet;
cancel:
@ -553,11 +555,11 @@ int ymodem_recv(FAR struct ymodem_ctx_s *ctx)
if (ctx->custom_size != 0)
{
ctx->header = calloc(1, + ctx->custom_size + 2);
ctx->header = calloc(1, 3 + ctx->custom_size + 2);
}
else
{
ctx->header = calloc(1, + YMODEM_PACKET_1K_SIZE + 2);
ctx->header = calloc(1, 3 + YMODEM_PACKET_1K_SIZE + 2);
}
if (ctx->header == NULL)
@ -579,7 +581,7 @@ int ymodem_recv(FAR struct ymodem_ctx_s *ctx)
tcgetattr(ctx->recvfd, &term);
memcpy(&saveterm, &term, sizeof(struct termios));
cfmakeraw(&term);
term.c_cc[VTIME] = 30;
term.c_cc[VTIME] = 15;
term.c_cc[VMIN] = 255;
tcsetattr(ctx->recvfd, TCSANOW, &term);
@ -607,11 +609,11 @@ int ymodem_send(FAR struct ymodem_ctx_s *ctx)
if (ctx->custom_size != 0)
{
ctx->header = calloc(1, + ctx->custom_size + 2);
ctx->header = calloc(1, 3 + ctx->custom_size + 2);
}
else
{
ctx->header = calloc(1, + YMODEM_PACKET_1K_SIZE + 2);
ctx->header = calloc(1, 3 + YMODEM_PACKET_1K_SIZE + 2);
}
if (ctx->header == NULL)