Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Connect() now sets the initial send queue sequence before calling _SendQueued()

Browse Source 
so that it's already correct at this point (even though it's currently not
  possible to queue data before connecting, it might be in some point in the future).
* ListenReceive() did not initialize the initial send queue sequence of the new
  endpoint correctly; it took the values from the wrong endpoint (itself).
* Suppressed the debug output "FIN ack'd" when the connection was not even established
  yet.
* Minor debug output improvements.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19666 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2007-01-01 16:25:19 +00:00
parent c304c8ee1a
commit 806dfb98ff
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
View File

@ -252,6 +252,7 @@ TCPEndpoint::Connect(const struct sockaddr *address)
fSendNext = fInitialSendSequence; fSendNext = fInitialSendSequence;
fSendUnacknowledged = fInitialSendSequence; fSendUnacknowledged = fInitialSendSequence;
fSendMax = fInitialSendSequence; fSendMax = fInitialSendSequence;
fSendQueue.SetInitialSequence(fSendNext + 1);
// send SYN // send SYN
status = _SendQueued(); status = _SendQueued();
@ -260,8 +261,6 @@ TCPEndpoint::Connect(const struct sockaddr *address)
return status; return status;
} }
fSendQueue.SetInitialSequence(fSendNext);
// wait until 3-way handshake is complete (if needed) // wait until 3-way handshake is complete (if needed)
bigtime_t timeout = min_c(socket->send.timeout, TCP_CONNECTION_TIMEOUT); bigtime_t timeout = min_c(socket->send.timeout, TCP_CONNECTION_TIMEOUT);
@ -368,7 +367,8 @@ TCPEndpoint::Shutdown(int direction)
status_t status_t
TCPEndpoint::SendData(net_buffer *buffer) TCPEndpoint::SendData(net_buffer *buffer)
{ {
TRACE(("TCP:%p.SendData(buffer %p, size %lu)\n", this, buffer, buffer->size)); TRACE(("TCP:%p.SendData(buffer %p, size %lu, flags %lx)\n",
this, buffer, buffer->size, buffer->flags));
size_t bytesLeft = buffer->size; size_t bytesLeft = buffer->size;
@ -624,8 +624,8 @@ TCPEndpoint::ListenReceive(tcp_segment_header &segment, net_buffer *buffer)
// send SYN+ACK // send SYN+ACK
status_t status = endpoint->_SendQueued(); status_t status = endpoint->_SendQueued();
endpoint->fInitialSendSequence = fSendNext; endpoint->fInitialSendSequence = endpoint->fSendNext;
endpoint->fSendQueue.SetInitialSequence(fSendNext); endpoint->fSendQueue.SetInitialSequence(endpoint->fSendNext);
if (status < B_OK) if (status < B_OK)
return DROP; return DROP;
@ -702,7 +702,7 @@ TCPEndpoint::SynchronizeSentReceive(tcp_segment_header &segment, net_buffer *buf
int32 int32
TCPEndpoint::Receive(tcp_segment_header &segment, net_buffer *buffer) TCPEndpoint::Receive(tcp_segment_header &segment, net_buffer *buffer)
{ {
TRACE(("TCP:%p.ReceiveData(): Connection in state %d received packet %p (%lu bytes) with flags 0x%x, seq %lu, ack %lu!\n", TRACE(("TCP:%p.Receive(): Connection in state %d received packet %p (%lu bytes) with flags 0x%x, seq %lu, ack %lu!\n",
this, fState, buffer, buffer->size, segment.flags, segment.sequence, segment.acknowledge)); this, fState, buffer, buffer->size, segment.flags, segment.sequence, segment.acknowledge));
// TODO: rethink locking! // TODO: rethink locking!
@ -891,7 +891,7 @@ dprintf("set retransmit timer!\n");
if (fSendNext < fSendUnacknowledged) if (fSendNext < fSendUnacknowledged)
fSendNext = fSendUnacknowledged; fSendNext = fSendUnacknowledged;
if (segment.acknowledge > fSendQueue.LastSequence()) { if (segment.acknowledge > fSendQueue.LastSequence() && fState > ESTABLISHED) {
// our TCP_FLAG_FINISH has been acknowledged // our TCP_FLAG_FINISH has been acknowledged
dprintf("FIN has been acknowledged!\n"); dprintf("FIN has been acknowledged!\n");