From b9d6336526ba03c32704c8a5e2f856cdda4107fa Mon Sep 17 00:00:00 2001 From: HubretXie Date: Thu, 1 Nov 2018 14:23:30 +0800 Subject: [PATCH 1/2] Update at_socket.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit at接收超时 添加 EAGAIN 类型返回 --- components/net/at/at_socket/at_socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/components/net/at/at_socket/at_socket.c b/components/net/at/at_socket/at_socket.c index 6fd2e765d4..6357caa66e 100644 --- a/components/net/at/at_socket/at_socket.c +++ b/components/net/at/at_socket/at_socket.c @@ -668,6 +668,7 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f if (rt_sem_take(sock->recv_notice, timeout) < 0) { LOG_E("AT socket (%d) receive timeout (%d)!", socket, timeout); + errno = EAGAIN; result = -1; goto __exit; } From 61bb8a05d2fc2a3a70b75a75151e2d8d74cb08af Mon Sep 17 00:00:00 2001 From: HubretXie Date: Thu, 1 Nov 2018 18:43:04 +0800 Subject: [PATCH 2/2] Update at_socket.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit at socket 接收数据正常时清除错误标识 --- components/net/at/at_socket/at_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/net/at/at_socket/at_socket.c b/components/net/at/at_socket/at_socket.c index 6357caa66e..01646f0d89 100644 --- a/components/net/at/at_socket/at_socket.c +++ b/components/net/at/at_socket/at_socket.c @@ -700,7 +700,7 @@ __exit: { result = recv_len; at_do_event_changes(sock, AT_EVENT_RECV, RT_FALSE); - + errno = 0; if (!rt_slist_isempty(&sock->recvpkt_list)) { at_do_event_changes(sock, AT_EVENT_RECV, RT_TRUE);