From a1a9e858a2d1c5b702f9a57ce657a06b148a5dd7 Mon Sep 17 00:00:00 2001 From: Hugo Santos Date: Wed, 25 Apr 2007 16:28:20 +0000 Subject: [PATCH] tiny TCP cleanups git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20815 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/network/protocols/tcp/EndpointManager.cpp | 2 +- .../kernel/network/protocols/tcp/TCPEndpoint.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp b/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp index 70b428b342..dfcdda83b8 100644 --- a/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp +++ b/src/add-ons/kernel/network/protocols/tcp/EndpointManager.cpp @@ -384,7 +384,7 @@ EndpointManager::Unbind(TCPEndpoint *endpoint) endpoint->fEndpointNextWithSamePort = NULL; fConnectionHash.Remove(endpoint); - endpoint->socket->address.ss_len = 0; + endpoint->LocalAddress()->sa_len = 0; return B_OK; } diff --git a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp index d5f0128002..32d35a7763 100644 --- a/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp +++ b/src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp @@ -707,7 +707,7 @@ TCPEndpoint::SetReceiveBufferSize(size_t length) bool TCPEndpoint::IsBound() const { - return !AddressModule()->is_empty_address((sockaddr *)&socket->address, true); + return !AddressModule()->is_empty_address(LocalAddress(), true); } @@ -814,7 +814,7 @@ TCPEndpoint::Spawn(TCPEndpoint *parent, tcp_segment_header &segment, TRACE("Spawn()"); // TODO: proper error handling! - if (_PrepareSendPath((sockaddr *)&socket->peer) < B_OK) + if (_PrepareSendPath(PeerAddress()) < B_OK) return DROP; fOptions = parent->fOptions; @@ -1158,8 +1158,8 @@ TCPEndpoint::_SendQueued(bool force, uint32 sendWindow) return status; } - AddressModule()->set_to((sockaddr *)&buffer->source, (sockaddr *)&socket->address); - AddressModule()->set_to((sockaddr *)&buffer->destination, (sockaddr *)&socket->peer); + AddressModule()->set_to((sockaddr *)&buffer->source, LocalAddress()); + AddressModule()->set_to((sockaddr *)&buffer->destination, PeerAddress()); uint32 size = buffer->size; segment.sequence = fSendNext; @@ -1616,8 +1616,8 @@ TCPEndpoint::_PrepareSendPath(const sockaddr *peer) } // make sure connection does not already exist - status_t status = fManager->SetConnection(this, - (sockaddr *)&socket->address, peer, fRoute->interface->address); + status_t status = fManager->SetConnection(this, LocalAddress(), peer, + fRoute->interface->address); if (status < B_OK) return status;