fix(socket_mt): disable real "shutdown" function

wujiangang · wujiangang · commit 25a9c26df3c2 · 2018-03-26T10:39:04.000+08:00
internal: b3e8a313
diff --git a/VERSION b/VERSION
@@ -13,7 +13,7 @@ gwen:
 gitlab:
     espconn:    3a998034
     freertos:   a9985a9c
-    lwip:       391bef1e
+    lwip:       1651e055
     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
@@ -832,7 +832,7 @@ int lwip_fcntl_mt(int s, int cmd, int val)
     return ret;
 }
 
-int lwip_shutdown_mt(int s, int how)
+LOCAL int __lwip_shutdown_mt(int s, int how)
 {
     int ret;
 
@@ -847,14 +847,19 @@ int lwip_shutdown_mt(int s, int how)
     return ret;
 }
 
+int lwip_shutdown_mt(int s, int how)
+{
+    return lwip_shutdown(s, how);
+}
+
 int lwip_close_mt(int s)
 {
     int ret;
     int i;
     SYS_ARCH_DECL_PROTECT(lev);
     sys_mutex_t lock_tmp[SOCK_MT_LOCK_MAX];
 
-	lwip_shutdown_mt(s, SHUT_RDWR);
+	__lwip_shutdown_mt(s, SHUT_RDWR);
 
     LWIP_ENTER_MT(s, SOCK_MT_CLOSE, 0);	
 

Original file line number	Diff line number	Diff line change
`@@ -832,7 +832,7 @@ int lwip_fcntl_mt(int s, int cmd, int val)`
`832`	`832`	`return ret;`
`833`	`833`	`}`
`834`	`834`
`835`		`-int lwip_shutdown_mt(int s, int how)`
	`835`	`+LOCAL int __lwip_shutdown_mt(int s, int how)`
`836`	`836`	`{`
`837`	`837`	`int ret;`
`838`	`838`
`@@ -847,14 +847,19 @@ int lwip_shutdown_mt(int s, int how)`
`847`	`847`	`return ret;`
`848`	`848`	`}`
`849`	`849`
	`850`	`+int lwip_shutdown_mt(int s, int how)`
	`851`	`+{`
	`852`	`+ return lwip_shutdown(s, how);`
	`853`	`+}`
	`854`	`+`
`850`	`855`	`int lwip_close_mt(int s)`
`851`	`856`	`{`
`852`	`857`	`int ret;`
`853`	`858`	`int i;`
`854`	`859`	`SYS_ARCH_DECL_PROTECT(lev);`
`855`	`860`	`sys_mutex_t lock_tmp[SOCK_MT_LOCK_MAX];`
`856`	`861`
`857`		`- lwip_shutdown_mt(s, SHUT_RDWR);`
	`862`	`+ __lwip_shutdown_mt(s, SHUT_RDWR);`
`858`	`863`
`859`	`864`	`LWIP_ENTER_MT(s, SOCK_MT_CLOSE, 0);`
`860`	`865`