espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

lwip: fix nonblocking tcp close issue

Browse Source 
Fix assert issue causes by closing nonblocking tcp socket.
This commit is contained in:
Liu Zhi Fu
2018-07-14 14:58:00 +08:00
committed by bot
parent 8a1adb0d50
commit 9fb746824a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/lwip/api/sockets.c
View File

@@ -266,11 +266,11 @@ do{\
}\ }\
}while(0) }while(0)
#define LWIP_SET_CLOSE_FLAG() \ #define LWIP_SET_CLOSE_FLAG(_flag) \
do{\ do{\
LWIP_SOCK_LOCK(__sock);\ LWIP_SOCK_LOCK(__sock);\
LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("mark sock closing\n"));\ LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("mark sock closing\n"));\
__sock->state = LWIP_SOCK_CLOSING;\ __sock->state = (_flag);\
LWIP_SOCK_UNLOCK(__sock);\ LWIP_SOCK_UNLOCK(__sock);\
}while(0) }while(0)
@@ -3312,8 +3312,11 @@ int
lwip_close_r(int s) lwip_close_r(int s)
{ {
LWIP_API_LOCK(); LWIP_API_LOCK();
LWIP_SET_CLOSE_FLAG(); LWIP_SET_CLOSE_FLAG(LWIP_SOCK_CLOSING);
__ret = lwip_close(s); __ret = lwip_close(s);
if (EWOULDBLOCK == __sock->err) {
LWIP_SET_CLOSE_FLAG(LWIP_SOCK_OPEN);
}
LWIP_API_UNLOCK(); LWIP_API_UNLOCK();
} }