From c25ceaf06bc60edfa09281610d5c3c1c9f5f6706 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Thu, 24 Sep 2015 16:15:14 -0400 Subject: [PATCH] Fixed recursive lock problem in closeConnection --- netcon/LWIPStack.hpp | 3 +++ netcon/NetconEthernetTap.cpp | 21 ++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/netcon/LWIPStack.hpp b/netcon/LWIPStack.hpp index 82b06377f..ee1a88713 100644 --- a/netcon/LWIPStack.hpp +++ b/netcon/LWIPStack.hpp @@ -145,6 +145,9 @@ public: void (*_netif_set_up)(NETIF_SET_UP_SIG); void (*_netif_poll)(NETIF_POLL_SIG); + + Mutex _lock; + LWIPStack(const char* path) : _libref(NULL) { diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp index a060b97c9..30217b6f9 100644 --- a/netcon/NetconEthernetTap.cpp +++ b/netcon/NetconEthernetTap.cpp @@ -292,14 +292,14 @@ void NetconEthernetTap::closeAllClients() void NetconEthernetTap::closeConnection(NetconConnection *conn) { NetconClient *client = conn->owner; - lwipstack->tcp_arg(conn->pcb, NULL); - lwipstack->tcp_sent(conn->pcb, NULL); - lwipstack->tcp_recv(conn->pcb, NULL); - lwipstack->tcp_err(conn->pcb, NULL); - lwipstack->tcp_poll(conn->pcb, NULL, 0); - lwipstack->tcp_close(conn->pcb); + lwipstack->_tcp_arg(conn->pcb, NULL); + lwipstack->_tcp_sent(conn->pcb, NULL); + lwipstack->_tcp_recv(conn->pcb, NULL); + lwipstack->_tcp_err(conn->pcb, NULL); + lwipstack->_tcp_poll(conn->pcb, NULL, 0); + lwipstack->_tcp_close(conn->pcb); _phy.close(conn->sock); - lwipstack->tcp_close(conn->pcb); + lwipstack->_tcp_close(conn->pcb); client->removeConnection(conn->sock); } @@ -308,8 +308,11 @@ void NetconEthernetTap::closeConnection(NetconConnection *conn) */ void NetconEthernetTap::closeClient(NetconClient *client) { - closeConnection(client->rpc); - closeConnection(client->unmapped_conn); + { + Mutex::Lock _l(lwipstack->_lock); + closeConnection(client->rpc); + closeConnection(client->unmapped_conn); + } for(size_t i=0; iconnections.size(); i++) { close(_phy.getDescriptor(client->connections[i]->sock));