Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/tw24252_fix_nonblocking_tcp_close_issue_v3.1' into 'release/v3.1'

Browse source 
lwip: fix nonblocking tcp close issue (backport v3.1)

See merge request idf/esp-idf!2938
This commit is contained in:
Jiang Jiang Jian 2018-08-14 13:20:08 +08:00
parent 2e60a4b751 9fb746824a
commit 2dfe58e1b3
1 changed files with 6 additions and 3 deletions
Show stats 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)
#define LWIP_SET_CLOSE_FLAG() \
#define LWIP_SET_CLOSE_FLAG(_flag) \
do{\
LWIP_SOCK_LOCK(__sock);\
LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("mark sock closing\n"));\
__sock->state = LWIP_SOCK_CLOSING;\
__sock->state = (_flag);\
LWIP_SOCK_UNLOCK(__sock);\
}while(0)
@ -3312,8 +3312,11 @@ int
lwip_close_r(int s)
{
LWIP_API_LOCK();
LWIP_SET_CLOSE_FLAG();
LWIP_SET_CLOSE_FLAG(LWIP_SOCK_CLOSING);
__ret = lwip_close(s);
if (EWOULDBLOCK == __sock->err) {
LWIP_SET_CLOSE_FLAG(LWIP_SOCK_OPEN);
}
LWIP_API_UNLOCK();
}