fix(lwip): Fix lwip TCP server "accept" sync error

donghengqaz · donghengqaz · commit 855c80c9bfff · 2018-07-30T19:01:50.000+08:00
diff --git a/components/lwip/lwip/src/api/api_msg.c b/components/lwip/lwip/src/api/api_msg.c
@@ -799,12 +799,18 @@ netconn_drain(struct netconn *conn)
         /* Only tcp pcbs have an acceptmbox, so no need to check conn->type */
         /* pcb might be set to NULL already by err_tcp() */
         /* drain recvmbox */
+#ifdef ESP_LWIP
+        if (newconn) {
+#endif /* ESP_LWIP */
         netconn_drain(newconn);
         if (newconn->pcb.tcp != NULL) {
           tcp_abort(newconn->pcb.tcp);
           newconn->pcb.tcp = NULL;
         }
         netconn_free(newconn);
+#ifdef ESP_LWIP
+        }
+#endif /* ESP_LWIP */
       }
     }
     sys_mbox_free(&conn->acceptmbox);

Original file line number	Diff line number	Diff line change
`@@ -799,12 +799,18 @@ netconn_drain(struct netconn *conn)`
`799`	`799`	`/* Only tcp pcbs have an acceptmbox, so no need to check conn->type */`
`800`	`800`	`/* pcb might be set to NULL already by err_tcp() */`
`801`	`801`	`/* drain recvmbox */`
	`802`	`+#ifdef ESP_LWIP`
	`803`	`+ if (newconn) {`
	`804`	`+#endif /* ESP_LWIP */`
`802`	`805`	`netconn_drain(newconn);`
`803`	`806`	`if (newconn->pcb.tcp != NULL) {`
`804`	`807`	`tcp_abort(newconn->pcb.tcp);`
`805`	`808`	`newconn->pcb.tcp = NULL;`
`806`	`809`	`}`
`807`	`810`	`netconn_free(newconn);`
	`811`	`+#ifdef ESP_LWIP`
	`812`	`+ }`
	`813`	`+#endif /* ESP_LWIP */`
`808`	`814`	`}`
`809`	`815`	`}`
`810`	`816`	`sys_mbox_free(&conn->acceptmbox);`