mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 20:47:45 +00:00
Kernel: Make UserOrKernelBuffer return KResult from read/write/memset
This allows us to simplify a whole bunch of call sites with TRY(). :^)
This commit is contained in:
parent
7bf8844499
commit
b481132418
29 changed files with 85 additions and 118 deletions
|
@ -236,9 +236,9 @@ KResultOr<size_t> IPv4Socket::sendto(FileDescription&, const UserOrKernelBuffer&
|
|||
return set_so_error(ENOMEM);
|
||||
routing_decision.adapter->fill_in_ipv4_header(*packet, local_address(), routing_decision.next_hop,
|
||||
m_peer_address, (IPv4Protocol)protocol(), data_length, m_ttl);
|
||||
if (!data.read(packet->buffer->data() + ipv4_payload_offset, data_length)) {
|
||||
if (auto result = data.read(packet->buffer->data() + ipv4_payload_offset, data_length); result.is_error()) {
|
||||
routing_decision.adapter->release_packet_buffer(*packet);
|
||||
return set_so_error(EFAULT);
|
||||
return set_so_error(result);
|
||||
}
|
||||
routing_decision.adapter->send_packet(packet->bytes());
|
||||
routing_decision.adapter->release_packet_buffer(*packet);
|
||||
|
@ -371,8 +371,8 @@ KResultOr<size_t> IPv4Socket::receive_packet_buffered(FileDescription& descripti
|
|||
|
||||
if (type() == SOCK_RAW) {
|
||||
size_t bytes_written = min(packet.data.value().size(), buffer_length);
|
||||
if (!buffer.write(packet.data.value().data(), bytes_written))
|
||||
return set_so_error(EFAULT);
|
||||
if (auto result = buffer.write(packet.data.value().data(), bytes_written); result.is_error())
|
||||
return set_so_error(result);
|
||||
return bytes_written;
|
||||
}
|
||||
|
||||
|
|
|
@ -169,8 +169,8 @@ KResultOr<size_t> TCPSocket::protocol_receive(ReadonlyBytes raw_ipv4_packet, Use
|
|||
size_t payload_size = raw_ipv4_packet.size() - sizeof(IPv4Packet) - tcp_packet.header_size();
|
||||
dbgln_if(TCP_SOCKET_DEBUG, "payload_size {}, will it fit in {}?", payload_size, buffer_size);
|
||||
VERIFY(buffer_size >= payload_size);
|
||||
if (!buffer.write(tcp_packet.payload(), payload_size))
|
||||
return set_so_error(EFAULT);
|
||||
if (auto result = buffer.write(tcp_packet.payload(), payload_size); result.is_error())
|
||||
return set_so_error(result);
|
||||
return payload_size;
|
||||
}
|
||||
|
||||
|
@ -226,9 +226,11 @@ KResult TCPSocket::send_tcp_packet(u16 flags, const UserOrKernelBuffer* payload,
|
|||
tcp_packet.set_ack_number(m_ack_number);
|
||||
}
|
||||
|
||||
if (payload && !payload->read(tcp_packet.payload(), payload_size)) {
|
||||
routing_decision.adapter->release_packet_buffer(*packet);
|
||||
return set_so_error(EFAULT);
|
||||
if (payload) {
|
||||
if (auto result = payload->read(tcp_packet.payload(), payload_size); result.is_error()) {
|
||||
routing_decision.adapter->release_packet_buffer(*packet);
|
||||
return set_so_error(result);
|
||||
}
|
||||
}
|
||||
|
||||
if (flags & TCPFlags::SYN) {
|
||||
|
|
|
@ -65,8 +65,8 @@ KResultOr<size_t> UDPSocket::protocol_receive(ReadonlyBytes raw_ipv4_packet, Use
|
|||
auto& udp_packet = *static_cast<const UDPPacket*>(ipv4_packet.payload());
|
||||
VERIFY(udp_packet.length() >= sizeof(UDPPacket)); // FIXME: This should be rejected earlier.
|
||||
size_t read_size = min(buffer_size, udp_packet.length() - sizeof(UDPPacket));
|
||||
if (!buffer.write(udp_packet.payload(), read_size))
|
||||
return set_so_error(EFAULT);
|
||||
if (auto result = buffer.write(udp_packet.payload(), read_size); result.is_error())
|
||||
return set_so_error(result);
|
||||
return read_size;
|
||||
}
|
||||
|
||||
|
@ -86,8 +86,8 @@ KResultOr<size_t> UDPSocket::protocol_send(const UserOrKernelBuffer& data, size_
|
|||
udp_packet.set_source_port(local_port());
|
||||
udp_packet.set_destination_port(peer_port());
|
||||
udp_packet.set_length(udp_buffer_size);
|
||||
if (!data.read(udp_packet.payload(), data_length))
|
||||
return set_so_error(EFAULT);
|
||||
if (auto result = data.read(udp_packet.payload(), data_length); result.is_error())
|
||||
return set_so_error(result);
|
||||
|
||||
routing_decision.adapter->fill_in_ipv4_header(*packet, local_address(), routing_decision.next_hop,
|
||||
peer_address(), IPv4Protocol::UDP, udp_buffer_size, ttl());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue