Merge pull request #1760 from RT-Thread/fix_lwip_wq

BernardXiong · web-flow · commit 5251ab737f77 · 2018-09-01T15:25:06.000+08:00
[lwIP] Fix the wait queue initialization issue.
diff --git a/components/net/lwip-2.0.2/src/api/sockets.c b/components/net/lwip-2.0.2/src/api/sockets.c
@@ -410,8 +410,6 @@ lwip_tryget_socket(int s)
 	return tryget_socket(s);
 }
 
-
-
 /**
  * Allocate a new socket for a given netconn.
  *
@@ -443,6 +441,9 @@ alloc_socket(struct netconn *newconn, int accepted)
       sockets[i].sendevent  = (NETCONNTYPE_GROUP(newconn->type) == NETCONN_TCP ? (accepted != 0) : 1);
       sockets[i].errevent   = 0;
       sockets[i].err        = 0;
+#ifdef SAL_USING_POSIX
+      rt_wqueue_init(&sockets[i].wait_head);
+#endif
       return i + LWIP_SOCKET_OFFSET;
     }
     SYS_ARCH_UNPROTECT(lev);

Original file line number	Diff line number	Diff line change
`@@ -410,8 +410,6 @@ lwip_tryget_socket(int s)`
`410`	`410`	`return tryget_socket(s);`
`411`	`411`	`}`
`412`	`412`
`413`		`-`
`414`		`-`
`415`	`413`	`/**`
`416`	`414`	`* Allocate a new socket for a given netconn.`
`417`	`415`	`*`
`@@ -443,6 +441,9 @@ alloc_socket(struct netconn *newconn, int accepted)`
`443`	`441`	`sockets[i].sendevent = (NETCONNTYPE_GROUP(newconn->type) == NETCONN_TCP ? (accepted != 0) : 1);`
`444`	`442`	`sockets[i].errevent = 0;`
`445`	`443`	`sockets[i].err = 0;`
	`444`	`+#ifdef SAL_USING_POSIX`
	`445`	`+ rt_wqueue_init(&sockets[i].wait_head);`
	`446`	`+#endif`
`446`	`447`	`return i + LWIP_SOCKET_OFFSET;`
`447`	`448`	`}`
`448`	`449`	`SYS_ARCH_UNPROTECT(lev);`