diff options
author | Andreas Kling <kling@serenityos.org> | 2020-01-26 17:54:23 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-01-26 17:54:23 +0100 |
commit | 137a45dff2a6c60dbca34ee6b1e27ff476fe9b40 (patch) | |
tree | 49e38ba4b9d8938a34ef7a38bd0e856077bcd5f8 /Kernel/Net/LocalSocket.cpp | |
parent | d1721c761e3dce78ceb27aaaba2ad7836e669306 (diff) | |
download | serenity-137a45dff2a6c60dbca34ee6b1e27ff476fe9b40.zip |
Kernel: read()/write() should respect timeouts when used on a sockets
Move timeout management to the ReadBlocker and WriteBlocker classes.
Also get rid of the specialized ReceiveBlocker since it no longer does
anything that ReadBlocker can't do.
Diffstat (limited to 'Kernel/Net/LocalSocket.cpp')
-rw-r--r-- | Kernel/Net/LocalSocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Kernel/Net/LocalSocket.cpp b/Kernel/Net/LocalSocket.cpp index e334f41c8f..09df3ce43f 100644 --- a/Kernel/Net/LocalSocket.cpp +++ b/Kernel/Net/LocalSocket.cpp @@ -296,7 +296,7 @@ ssize_t LocalSocket::recvfrom(FileDescription& description, void* buffer, size_t return -EAGAIN; } } else if (!can_read(description)) { - auto result = current->block<Thread::ReceiveBlocker>(description); + auto result = current->block<Thread::ReadBlocker>(description); if (result != Thread::BlockResult::WokeNormally) return -EINTR; } |