Merge branch 'feature/add_option_recv_rst_data_although_tcp_aborts' into 'release/v3.3'

feat(lwip): Add option to receive rest data although TCP aborts

See merge request sdk/ESP8266_RTOS_SDK!1420

Author: donghengqaz

components/lwip/Kconfig

@@ -26,6 +26,12 @@ config LWIP_GLOBAL_DATA_LINK_IRAM
     help
         Link LWIP global data(.bss .data COMMON) from DRAM to IRAM.
 
+config ESP_LWIP_RECV_REST_DATA
+    bool "Receive rest data although TCP aborts"
+    default n
+    help
+        Receive rest data although TCP aborts.
+
 config TCPIP_RECVMBOX_SIZE
     int "TCPIP task receive mail box size"
     default 32

components/lwip/lwip/src/api/api_lib.c

@@ -500,13 +500,19 @@ netconn_recv_data(struct netconn *conn, void **new_buf)
 #endif /* LWIP_TCP */
   LWIP_ERROR("netconn_recv: invalid recvmbox", sys_mbox_valid(&conn->recvmbox), return ERR_CONN;);
 
+#if ESP_LWIP_RECV_REST_DATA
+  if (!sys_mbox_valid(&conn->recvmbox)) {
+#endif
   if (ERR_IS_FATAL(conn->last_err)) {
     /* don't recv on fatal errors: this might block the application task
        waiting on recvmbox forever! */
     /* @todo: this does not allow us to fetch data that has been put into recvmbox
        before the fatal error occurred - is that a problem? */
     return conn->last_err;
   }
+#if ESP_LWIP_RECV_REST_DATA
+  }
+#endif
 #if LWIP_TCP
 #if (LWIP_UDP || LWIP_RAW)
   if (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP)

components/lwip/port/esp8266/include/lwipopts.h

@@ -82,6 +82,12 @@
 #define ESP_NONBLOCK    0
 #endif
 
+#ifdef CONFIG_ESP_LWIP_RECV_REST_DATA
+#define ESP_LWIP_RECV_REST_DATA 1
+#else
+#define ESP_LWIP_RECV_REST_DATA 0
+#endif
+
 //#define SOCKETS_TCP_TRACE
 
 #define TCP_HIGH_SPEED_RETRANSMISSION CONFIG_TCP_HIGH_SPEED_RETRANSMISSION