Merge branch 'bugfix/fix_cipserver_error' into 'master'

fix(espconn): fix AT+CIPSERVER=0 not close socket See merge request sdk/ESP8266_NONOS_SDK!285

Author: xcguang

VERSION

@@ -17,6 +17,6 @@ phy:
 gitlab:
  driver : 5a2a54b4
  json : f55d5fee
- lwip : 5623f48f
+ lwip : f6bc9a8c
  mbedtls : 82b93fe5
  smartconfig : ea1d4a13(v2.5.5)

lib/liblwip.a

@@ -191,6 +191,7 @@ typedef struct _espconn_msg{
 uint8 recv_hold_flag;
 uint16 recv_holded_buf_Len;
 //*******************************************************
+uint8 close_flag;
 ringbuf *readbuf;
 }espconn_msg;
 

third_party/include/lwip/app/espconn.h

@@ -897,7 +897,9 @@ espconn_get_connection_info(struct espconn *pespconn, remot_info **pcon_info, ui
 premot[pespconn->link_cnt].state = plist->pespconn->state;
 premot[pespconn->link_cnt].remote_port = plist->pcommon.remote_port;
 os_memcpy(premot[pespconn->link_cnt].remote_ip,plist->pcommon.remote_ip, 4);
-pespconn->link_cnt ++;
+if (!plist->close_flag) {
+ pespconn->link_cnt ++;
+}
 }
 plist = plist->pnext;
 }

third_party/lwip/app/espconn.c

@@ -434,14 +434,20 @@ espconn_Task(os_event_t *events)
 break;
 case SIG_ESPCONN_ERRER:
 /*remove the node from the client's active connection list*/
- if (espconn_manual_recv_enabled(task_msg))
- espconn_list_delete(&plink_active, task_msg);
+if (espconn_manual_recv_enabled(task_msg)) {
+espconn_list_delete(&plink_active, task_msg);
+} else {
+plist->close_flag = 1;
+}
 espconn_tcp_reconnect(task_msg);
 break;
 case SIG_ESPCONN_CLOSE:
 /*remove the node from the client's active connection list*/
- if (espconn_manual_recv_enabled(task_msg))
- espconn_list_delete(&plink_active, task_msg);
+if (espconn_manual_recv_enabled(task_msg)) {
+espconn_list_delete(&plink_active, task_msg);
+} else {
+plist->close_flag = 1;
+}
 espconn_tcp_disconnect_successful(task_msg);
 break;
 default: