Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-21 02:06:14 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2043 from HubertXie/master

Browse Source 
Update at_socket.c
This commit is contained in:
Bernard Xiong
2018-12-12 12:55:21 +08:00
committed by GitHub
parent c059503007 3a8c6f32c0
commit a5b22a5b06
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/net/at/at_socket/at_socket.c
+9 -9
View File
@@ -627,6 +627,15 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
at_dev_ops->at_set_event_cb(AT_SOCKET_EVT_CLOSED, at_closed_notice_cb);
}
/* receive packet list last transmission of remaining data */
rt_mutex_take(sock->recv_lock, RT_WAITING_FOREVER);
if((recv_len = at_recvpkt_get(&(sock->recvpkt_list), (char *)mem, len)) > 0)
{
rt_mutex_release(sock->recv_lock);
goto __exit;
}
rt_mutex_release(sock->recv_lock);
/* socket passively closed, receive function return 0 */
if (sock->state == AT_SOCKET_CLOSED)
{
@@ -640,15 +649,6 @@ int at_recvfrom(int socket, void *mem, size_t len, int flags, struct sockaddr *f
goto __exit;
}
/* receive packet list last transmission of remaining data */
rt_mutex_take(sock->recv_lock, RT_WAITING_FOREVER);
if((recv_len = at_recvpkt_get(&(sock->recvpkt_list), (char *)mem, len)) > 0)
{
rt_mutex_release(sock->recv_lock);
goto __exit;
}
rt_mutex_release(sock->recv_lock);
/* non-blocking sockets receive data */
if (flags & MSG_DONTWAIT)
{