fix(multi-sockets): Fix multi-clients connection abnormal

wujiangang · wujiangang · commit 25de141e648f · 2018-01-08T10:30:45.000+08:00
select() should not judge socket fd just SHUTDOWN state when other socket closed actively
those socket will be in unreadable or unwriteable

abnormal step before:[ESP8266 as the tcp server]
1. ESP8266 set up a listen port (system default: socket = 0)
2. Client 1 connect to ESP8266 OK (system default: socket = 1)
3. Client 1 send data OK
4. Client 2 connect to ESP8266 OK (system default: socket = 2)
5. Client 1 and Client 2 send data OK
6. Disconnect Client 2 actively, Client 1 send data OK
7. Client 2 reconnect to ESP8266 OK (system default: socket = 2)
8. Client 1 and Client 2 send data OK
9. Disconnect Client 1 actively, select() API will return -1
    if Client 2 send data at this time, tcp server will not work

internal: 7c50f410
diff --git a/VERSION b/VERSION
@@ -13,7 +13,7 @@ gwen:
 gitlab:
     espconn:    3a998034
     freertos:   ac047746
-    lwip:       ac047746
+    lwip:       94e6ac0e
     driver:     7bee5263
     mbedtls:    1ac9f1f4
     ssl:        eefb383a
diff --git a/lib/liblwip.a b/lib/liblwip.a
diff --git a/third_party/lwip/api/multi-threads/sockets_mt.c b/third_party/lwip/api/multi-threads/sockets_mt.c
@@ -370,7 +370,8 @@ LOCAL int lwip_exit_mt_select(int s, int arg)
 	}
 
 	for (i = 0; i < s; i++) {
-		if (SOCK_MT_GET_SHUTDOWN(i) != SOCK_MT_SHUTDOWN_NONE) {
+	    if ((FD_ISSET(i, read_set) || FD_ISSET(i, write_set)) \
+	            && SOCK_MT_GET_SHUTDOWN(i) != SOCK_MT_SHUTDOWN_NONE) {
 			return -1;
 		}	
 	}

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,8 @@ LOCAL int lwip_exit_mt_select(int s, int arg)`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`for (i = 0; i < s; i++) {`
`373`		`- if (SOCK_MT_GET_SHUTDOWN(i) != SOCK_MT_SHUTDOWN_NONE) {`
	`373`	`+ if ((FD_ISSET(i, read_set) \|\| FD_ISSET(i, write_set)) \`
	`374`	`+ && SOCK_MT_GET_SHUTDOWN(i) != SOCK_MT_SHUTDOWN_NONE) {`
`374`	`375`	`return -1;`
`375`	`376`	`}`
`376`	`377`	`}`