Merge pull request #13205 from kjbracey-arm/lwipnonblock

0xc0170 · web-flow · commit 663492a24fe2 · 2020-07-01T12:29:22.000+02:00
LWIPStack: set sockets non-blocking
diff --git a/features/lwipstack/LWIPStack.cpp b/features/lwipstack/LWIPStack.cpp
@@ -271,7 +271,7 @@ nsapi_error_t LWIP::socket_open(nsapi_socket_t *handle, nsapi_protocol_t proto)
         return NSAPI_ERROR_NO_SOCKET;
     }
 
-    netconn_set_recvtimeout(s->conn, 1);
+    netconn_set_nonblocking(s->conn, true);
     *(struct mbed_lwip_socket **)handle = s;
     return 0;
 }
@@ -376,7 +376,7 @@ nsapi_error_t LWIP::socket_accept(nsapi_socket_t server, nsapi_socket_t *handle,
         return err_remap(err);
     }
 
-    netconn_set_recvtimeout(ns->conn, 1);
+    netconn_set_nonblocking(ns->conn, true);
     *(struct mbed_lwip_socket **)handle = ns;
 
     ip_addr_t peer_addr;
@@ -390,8 +390,6 @@ nsapi_error_t LWIP::socket_accept(nsapi_socket_t server, nsapi_socket_t *handle,
         address->set_port(port);
     }
 
-    netconn_set_nonblocking(ns->conn, true);
-
     return 0;
 #else
     return NSAPI_ERROR_UNSUPPORTED;
diff --git a/features/lwipstack/lwipopts.h b/features/lwipstack/lwipopts.h
@@ -201,7 +201,6 @@
 
 #define LWIP_COMPAT_SOCKETS         0
 #define LWIP_POSIX_SOCKETS_IO_NAMES 0
-#define LWIP_SO_RCVTIMEO            1
 
 #define LWIP_BROADCAST_PING         1
 

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ nsapi_error_t LWIP::socket_open(nsapi_socket_t *handle, nsapi_protocol_t proto)`
`271`	`271`	`return NSAPI_ERROR_NO_SOCKET;`
`272`	`272`	`}`
`273`	`273`
`274`		`- netconn_set_recvtimeout(s->conn, 1);`
	`274`	`+ netconn_set_nonblocking(s->conn, true);`
`275`	`275`	`(struct mbed_lwip_socket *)handle = s;`
`276`	`276`	`return 0;`
`277`	`277`	`}`
`@@ -376,7 +376,7 @@ nsapi_error_t LWIP::socket_accept(nsapi_socket_t server, nsapi_socket_t *handle,`
`376`	`376`	`return err_remap(err);`
`377`	`377`	`}`
`378`	`378`
`379`		`- netconn_set_recvtimeout(ns->conn, 1);`
	`379`	`+ netconn_set_nonblocking(ns->conn, true);`
`380`	`380`	`(struct mbed_lwip_socket *)handle = ns;`
`381`	`381`
`382`	`382`	`ip_addr_t peer_addr;`
`@@ -390,8 +390,6 @@ nsapi_error_t LWIP::socket_accept(nsapi_socket_t server, nsapi_socket_t *handle,`
`390`	`390`	`address->set_port(port);`
`391`	`391`	`}`
`392`	`392`
`393`		`- netconn_set_nonblocking(ns->conn, true);`
`394`		`-`
`395`	`393`	`return 0;`
`396`	`394`	`#else`
`397`	`395`	`return NSAPI_ERROR_UNSUPPORTED;`