mirror of
https://github.com/RGBCube/serenity
synced 2025-10-30 23:42:45 +00:00
3b1e063d30
A mistake I've repeatedly made is along these lines: ```c++ auto nread = TRY(source_file->read(buffer)); TRY(destination_file->write(buffer)); ``` It's a little clunky to have to create a Bytes or StringView from the buffer's data pointer and the nread, and easy to forget and just use the buffer. So, this patch changes the read() function to return a Bytes of the data that were just read. The other read_foo() methods will be modified in the same way in subsequent commits. Fixes #13687
53 lines
1.2 KiB
C++
53 lines
1.2 KiB
C++
/*
|
|
* Copyright (c) 2020, the SerenityOS developers.
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include "Client.h"
|
|
#include "LibCore/EventLoop.h"
|
|
|
|
Client::Client(int id, NonnullOwnPtr<Core::Stream::TCPSocket> socket)
|
|
: m_id(id)
|
|
, m_socket(move(socket))
|
|
{
|
|
m_socket->on_ready_to_read = [this] {
|
|
if (m_socket->is_eof())
|
|
return;
|
|
|
|
auto result = drain_socket();
|
|
if (result.is_error()) {
|
|
dbgln("Failed while trying to drain the socket: {}", result.error());
|
|
Core::deferred_invoke([this, strong_this = NonnullRefPtr(*this)] { quit(); });
|
|
}
|
|
};
|
|
}
|
|
|
|
ErrorOr<void> Client::drain_socket()
|
|
{
|
|
NonnullRefPtr<Client> protect(*this);
|
|
|
|
auto buffer = TRY(ByteBuffer::create_uninitialized(1024));
|
|
|
|
while (TRY(m_socket->can_read_without_blocking())) {
|
|
auto bytes_read = TRY(m_socket->read(buffer));
|
|
|
|
dbgln("Read {} bytes.", bytes_read.size());
|
|
|
|
if (m_socket->is_eof()) {
|
|
Core::deferred_invoke([this, strong_this = NonnullRefPtr(*this)] { quit(); });
|
|
break;
|
|
}
|
|
|
|
TRY(m_socket->write(bytes_read));
|
|
}
|
|
|
|
return {};
|
|
}
|
|
|
|
void Client::quit()
|
|
{
|
|
m_socket->close();
|
|
if (on_exit)
|
|
on_exit();
|
|
}
|