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

tcp: handle linger with zero timeout

Browse Source 
ReadData() should return the current error on closed state, not always not connected.

Change-Id: I286ac1dd9ded127e8658ceb61088783b9993eacf
Reviewed-on: https://review.haiku-os.org/c/haiku/+/6459
Reviewed-by: Rene Gollent <[email protected]>
This commit is contained in:
Jérôme Duval
2023-05-19 18:55:04 +00:00
committed by waddlesplash
parent 740f3ca4ae
commit ec97248c2a
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/tcp/TCPEndpoint.cpp
+12 -2
View File
@@ -545,11 +545,18 @@ TCPEndpoint::Close()
return B_OK;
}
// handle linger with zero timeout
if ((socket->options & SO_LINGER) != 0 && socket->linger == 0) {
fState = CLOSED;
T(State(this));
return _SendQueued(true);
}
status_t status = _Disconnect(true);
if (status != B_OK)
return status;
if (socket->options & SO_LINGER) {
if ((socket->options & SO_LINGER) != 0) {
TRACE("Close(): Lingering for %i secs", socket->linger);
bigtime_t maximum = absolute_timeout(socket->linger * 1000000LL);
@@ -933,8 +940,11 @@ TCPEndpoint::ReadData(size_t numBytes, uint32 flags, net_buffer** _buffer)
*_buffer = NULL;
if (fState == CLOSED)
if (fState == CLOSED) {
if (socket->error != B_OK)
return socket->error;
return ENOTCONN;
}
bigtime_t timeout = absolute_timeout(socket->receive.timeout);
if (gStackModule->is_restarted_syscall())