From 32c0d74cc592fec5397f033c75fd2c7866558ce9 Mon Sep 17 00:00:00 2001 From: XiaXiaotian Date: Tue, 19 Dec 2017 15:20:50 +0800 Subject: [PATCH] Close socket request will abort tcp write/connect When tcp write/connect is running, close socket request will abort it and continue to delete netconn and close tcp. Do not immediately return after aborting tcp write/connect. Otherwise, tcp close requeset will block and tcp write/connect will crash. --- components/lwip/api/api_msg.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/components/lwip/api/api_msg.c b/components/lwip/api/api_msg.c index a3f21fb53..2bc02c91e 100755 --- a/components/lwip/api/api_msg.c +++ b/components/lwip/api/api_msg.c @@ -1085,12 +1085,6 @@ lwip_netconn_do_delconn(void *m) } else #endif /* LWIP_NETCONN_FULLDUPLEX */ { - if (!(state != NETCONN_CONNECT || IN_NONBLOCKING_CONNECT(msg->conn))) { - msg->err = ERR_INPROGRESS; - NETCONN_SET_SAFE_ERR(msg->conn, ERR_INPROGRESS); - LWIP_DEBUGF(API_MSG_DEBUG, ("netconn error:ERR_INPROGRESS\n")); - return; - } /* Drain and delete mboxes */ netconn_drain(msg->conn);