libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[net][at] fix at select receive event change issue.

This commit is contained in:
chenyong 2018-09-14 17:32:11 +08:00
parent 0aa4b72b45
commit 8f95b78da2
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
components/net/at/at_socket/at_socket.c
View File

@ -513,6 +513,7 @@ static void at_closed_notice_cb(int socket, at_socket_evt_t event, const char *b
sock->state = AT_SOCKET_CLOSED; sock->state = AT_SOCKET_CLOSED;
rt_sem_release(sock->recv_notice); rt_sem_release(sock->recv_notice);
} }
int at_connect(int socket, const struct sockaddr *name, socklen_t namelen) int at_connect(int socket, const struct sockaddr *name, socklen_t namelen)
{ {
struct at_socket *sock; struct at_socket *sock;
@ -611,7 +612,13 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
sock->state = AT_SOCKET_CONNECT; sock->state = AT_SOCKET_CONNECT;
} }
if (sock->state != AT_SOCKET_CONNECT) /* socket passively closed, receive function return 0 */
if (sock->state == AT_SOCKET_CLOSED)
{
result = 0;
goto __exit;
}
else if (sock->state != AT_SOCKET_CONNECT)
{ {
LOG_E("received data error, current socket (%d) state (%d) is error.", socket, sock->state); LOG_E("received data error, current socket (%d) state (%d) is error.", socket, sock->state);
result = -1; result = -1;
@ -664,7 +671,7 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
else else
{ {
LOG_D("received data exit, current socket (%d) is closed by remote.", socket); LOG_D("received data exit, current socket (%d) is closed by remote.", socket);
result = -1; result = 0;
goto __exit; goto __exit;
} }
} }
@ -672,17 +679,19 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
__exit: __exit:
if (result < 0) if (recv_len > 0)
{ {
at_do_event_changes(sock, AT_EVENT_ERROR, RT_TRUE); result = recv_len;
at_do_event_changes(sock, AT_EVENT_RECV, RT_FALSE);
if (!rt_slist_isempty(&sock->recvpkt_list))
{
at_do_event_changes(sock, AT_EVENT_RECV, RT_TRUE);
}
} }
else else
{ {
result = recv_len; at_do_event_changes(sock, AT_EVENT_ERROR, RT_TRUE);
if (recv_len)
{
at_do_event_changes(sock, AT_EVENT_RECV, RT_FALSE);
}
} }
return result; return result;

4
components/net/at/include/at.h
View File

@ -32,8 +32,8 @@
extern "C" { extern "C" {
#endif #endif
#define AT_SW_VERSION "1.0.1" #define AT_SW_VERSION "1.0.2"
#define AT_SW_VERSION_NUM 0x10000 #define AT_SW_VERSION_NUM 0x10002
#define DBG_ENABLE #define DBG_ENABLE
#define DBG_SECTION_NAME "AT" #define DBG_SECTION_NAME "AT"