From 545be9ce4c0801e9ff246d3c15d06d5af8759859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 4 Dec 2006 17:28:14 +0000 Subject: [PATCH] We shouldn't try to unlock a no-longer-existing endpoint. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19425 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../network/protocols/tcp/TCPEndpoint.cpp | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp index dc42aff432..585daf82c5 100644 --- a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp +++ b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp @@ -1166,42 +1166,42 @@ TCPEndpoint::_SendQueued(bool force) /*static*/ void TCPEndpoint::_RetransmitTimer(net_timer *timer, void *data) { - TCPEndpoint *connection = (TCPEndpoint *)data; + TCPEndpoint *endpoint = (TCPEndpoint *)data; - RecursiveLocker locker(connection->Lock()); + RecursiveLocker locker(endpoint->Lock()); - connection->fSendNext = connection->fSendUnacknowledged; - connection->_SendQueued(); - connection->fSendNext = connection->fSendMax; + endpoint->fSendNext = endpoint->fSendUnacknowledged; + endpoint->_SendQueued(); + endpoint->fSendNext = endpoint->fSendMax; } /*static*/ void TCPEndpoint::_PersistTimer(net_timer *timer, void *data) { - TCPEndpoint *connection = (TCPEndpoint *)data; + TCPEndpoint *endpoint = (TCPEndpoint *)data; - RecursiveLocker locker(connection->Lock()); - connection->_SendQueued(true); + RecursiveLocker locker(endpoint->Lock()); + endpoint->_SendQueued(true); } /*static*/ void TCPEndpoint::_DelayedAcknowledgeTimer(struct net_timer *timer, void *data) { - TCPEndpoint *connection = (TCPEndpoint *)data; + TCPEndpoint *endpoint = (TCPEndpoint *)data; - RecursiveLocker locker(connection->Lock()); - connection->_SendQueued(true); + RecursiveLocker locker(endpoint->Lock()); + endpoint->_SendQueued(true); } /*static*/ void TCPEndpoint::_TimeWaitTimer(struct net_timer *timer, void *data) { - TCPEndpoint *connection = (TCPEndpoint *)data; + TCPEndpoint *endpoint = (TCPEndpoint *)data; - RecursiveLocker locker(connection->Lock()); - gSocketModule->delete_socket(connection->socket); + recursive_lock_lock(&endpoint->Lock()); + gSocketModule->delete_socket(endpoint->socket); }