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

Fixed a TCP issue reported by Stephan. Make sure we have enough PSH'ed bytes in the receive buffer before breaking the RX loop.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20619 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Hugo Santos
2007-04-08 21:34:11 +00:00
parent b5a071bc22
commit 7e6e645a87
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
+6 -5
View File
@@ -470,7 +470,7 @@ TCPEndpoint::SendAvailable()
status_t status_t
TCPEndpoint::ReadData(size_t numBytes, uint32 flags, net_buffer** _buffer) TCPEndpoint::ReadData(size_t numBytes, uint32 flags, net_buffer** _buffer)
{ {
TRACE("ReadData(%lu bytes)", numBytes); TRACE("ReadData(%lu bytes, flags 0x%x)", numBytes, (unsigned int)flags);
RecursiveLocker locker(fLock); RecursiveLocker locker(fLock);
@@ -510,9 +510,10 @@ TCPEndpoint::ReadData(size_t numBytes, uint32 flags, net_buffer** _buffer)
if (timeout != B_INFINITE_TIMEOUT) if (timeout != B_INFINITE_TIMEOUT)
timeout += system_time(); timeout += system_time();
while (fReceiveQueue.PushedData() == 0 while ((fFlags & FLAG_NO_RECEIVE) == 0
&& fReceiveQueue.Available() < dataNeeded && fReceiveQueue.Available() < dataNeeded
&& (fFlags & FLAG_NO_RECEIVE) == 0) { && (fReceiveQueue.PushedData() == 0
|| fReceiveQueue.Available() < fReceiveQueue.PushedData())) {
locker.Unlock(); locker.Unlock();
status_t status = acquire_sem_etc(fReceiveLock, 1, status_t status = acquire_sem_etc(fReceiveLock, 1,
@@ -532,8 +533,8 @@ TCPEndpoint::ReadData(size_t numBytes, uint32 flags, net_buffer** _buffer)
} }
} }
TRACE("ReadData(): read %lu bytes, %lu are available", TRACE("ReadData(): read %lu bytes, %lu are available (flags 0x%x)",
numBytes, fReceiveQueue.Available()); numBytes, fReceiveQueue.Available(), (unsigned int)fFlags);
if (numBytes < fReceiveQueue.Available()) if (numBytes < fReceiveQueue.Available())
release_sem_etc(fReceiveLock, 1, B_DO_NOT_RESCHEDULE); release_sem_etc(fReceiveLock, 1, B_DO_NOT_RESCHEDULE);