RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 08:07:44 +00:00
Code Issues Activity Actions

IPv4: Disconnected non-blocking sockets were not signalling EOF

Browse source 
After a socket has disconnected, we shouldn't return -EAGAIN. Instead
we should allow userspace to read/recvfrom the socket until its packet
queue has been exhausted.

At that point, we now return 0, signalling EOF.

It might be even better to start returning -ENOTCONN after signalling
EOF once. I'm not sure how that should work, needs looking into.
This commit is contained in:
Andreas Kling 2019-11-18 17:30:45 +01:00
parent b7a840fd0d
commit 0e9e70ca4f
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Kernel/Net/IPv4Socket.cpp
View file

@ -222,8 +222,14 @@ ssize_t IPv4Socket::recvfrom(FileDescription& description, void* buffer, size_t
ReceivedPacket packet; ReceivedPacket packet;
{ {
LOCKER(lock()); LOCKER(lock());
if (m_receive_queue.is_empty() && !description.is_blocking()) if (m_receive_queue.is_empty()) {
return -EAGAIN; // FIXME: Shouldn't this return -ENOTCONN instead of EOF?
// But if so, we still need to deliver at least one EOF read to userspace.. right?
if (protocol_is_disconnected())
return 0;
if (!description.is_blocking())
return -EAGAIN;
}
if (!m_receive_queue.is_empty()) { if (!m_receive_queue.is_empty()) {
packet = m_receive_queue.take_first(); packet = m_receive_queue.take_first();