ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2579 from geky/nsapi-max-socket-accept 

lwip - Fix handling of max sockets in socket_accept
pull/2593/head
Sam Grove 2016-09-10 07:11:20 -05:00 committed by GitHub
parent fb7ffcb5a3 db2738f850
commit a35cd7f81f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
features/net/FEATURE_IPV4/lwip-interface/lwip_stack.c
View File

@ -313,6 +313,9 @@ static int lwip_socket_accept(nsapi_stack_t *stack, nsapi_socket_t server, nsapi
{ {
struct lwip_socket *s = (struct lwip_socket *)server; struct lwip_socket *s = (struct lwip_socket *)server;
struct lwip_socket *ns = lwip_arena_alloc(); struct lwip_socket *ns = lwip_arena_alloc();
if (!ns) {
return NSAPI_ERROR_NO_SOCKET;
}
err_t err = netconn_accept(s->conn, &ns->conn); err_t err = netconn_accept(s->conn, &ns->conn);
if (err != ERR_OK) { if (err != ERR_OK) {

9
features/net/network-socket/TCPServer.cpp
View File

@ -76,16 +76,19 @@ int TCPServer::accept(TCPSocket *connection, SocketAddress *address)
connection->_lock.unlock(); connection->_lock.unlock();
break; break;
} } else if (NSAPI_ERROR_WOULD_BLOCK != ret) {
break;
if (NSAPI_ERROR_WOULD_BLOCK == ret) { } else {
int32_t count; int32_t count;
// Release lock before blocking so other threads
// accessing this object aren't blocked
_lock.unlock(); _lock.unlock();
count = _accept_sem.wait(_timeout); count = _accept_sem.wait(_timeout);
_lock.lock(); _lock.lock();
if (count < 1) { if (count < 1) {
// Semaphore wait timed out so break out and return
ret = NSAPI_ERROR_WOULD_BLOCK; ret = NSAPI_ERROR_WOULD_BLOCK;
break; break;
} }