i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Could not connect locally anymore, as fSendNext and fSendMax must be set before

Browse Source 
the segment is sent in this case (as receive/send will currently stack up in a
single thread).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19660 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-12-31 14:27:12 +00:00
parent 22e7921700
commit e19a0bfa1b
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
+19 -11
View File
@@ -1162,31 +1162,39 @@ TCPEndpoint::_SendQueued(bool force)
// TODO: we need to trim the segment to the max segment size in case
// the options made it too large
status = next->module->send_routed_data(next, fRoute, buffer);
if (status < B_OK) {
gBufferModule->free(buffer);
return status;
}
// Update send status - we need to do this before we send the data
// for local connections as the answer is directly handled
// Only count 1 SYN, the 1 sent when transitioning from CLOSED or LISTEN
if ((segment.flags & TCP_FLAG_SYNCHRONIZE) != 0) {
// count SYN into sequence length and reset options for the next segment
segment.max_segment_size = 0;
segment.has_window_shift = false;
size++;
}
// Only count 1 FIN, the 1 sent when transitioning from
// ESTABLISHED, SYNCHRONIZE_RECEIVED or FINISH_RECEIVED
if ((segment.flags & TCP_FLAG_FINISH) != 0)
if ((segment.flags & TCP_FLAG_FINISH) != 0) {
// count FIN into sequence length
size++;
}
if (fSendMax == fSendNext)
fSendMax += size;
uint32 sendMax = fSendMax;
fSendNext += size;
if (fSendMax < fSendNext)
fSendMax = fSendNext;
fReceiveMaxAdvertised = fReceiveNext
+ ((uint32)segment.advertised_window << fReceiveWindowShift);
status = next->module->send_routed_data(next, fRoute, buffer);
if (status < B_OK) {
gBufferModule->free(buffer);
fSendNext = segment.sequence;
fSendMax = sendMax;
// restore send status
return status;
}
length -= segmentLength;
if (length == 0)
break;