RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:37:35 +00:00
Code Issues Activity Actions

Kernel: Tidy up UDPSocket creation a bit

Browse source 
- Rename create() => try_create()
- Use adopt_nonnull_ref_or_enomem()
This commit is contained in:
Andreas Kling 2021-09-04 23:04:06 +02:00
parent 648c768d81
commit 7d8e036e26
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/Net/IPv4Socket.cpp
View file

@ -53,10 +53,10 @@ KResultOr<NonnullRefPtr<Socket>> IPv4Socket::create(int type, int protocol)
return tcp_socket_or_error.release_value(); return tcp_socket_or_error.release_value();
} }
if (type == SOCK_DGRAM) { if (type == SOCK_DGRAM) {
auto udp_socket = UDPSocket::create(protocol, receive_buffer.release_nonnull()); auto udp_socket_or_error = UDPSocket::try_create(protocol, receive_buffer.release_nonnull());
if (udp_socket.is_error()) if (udp_socket_or_error.is_error())
return udp_socket.error(); return udp_socket_or_error.error();
return udp_socket.release_value(); return udp_socket_or_error.release_value();
} }
if (type == SOCK_RAW) { if (type == SOCK_RAW) {
auto raw_socket = adopt_ref_if_nonnull(new (nothrow) IPv4Socket(type, protocol, receive_buffer.release_nonnull(), {})); auto raw_socket = adopt_ref_if_nonnull(new (nothrow) IPv4Socket(type, protocol, receive_buffer.release_nonnull(), {}));

7
Kernel/Net/UDPSocket.cpp
View file

@ -54,12 +54,9 @@ UDPSocket::~UDPSocket()
}); });
} }
KResultOr<NonnullRefPtr<UDPSocket>> UDPSocket::create(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer) KResultOr<NonnullRefPtr<UDPSocket>> UDPSocket::try_create(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer)
{ {
auto socket = adopt_ref_if_nonnull(new (nothrow) UDPSocket(protocol, move(receive_buffer))); return adopt_nonnull_ref_or_enomem(new (nothrow) UDPSocket(protocol, move(receive_buffer)));
if (socket)
return socket.release_nonnull();
return ENOMEM;
} }
KResultOr<size_t> UDPSocket::protocol_receive(ReadonlyBytes raw_ipv4_packet, UserOrKernelBuffer& buffer, size_t buffer_size, [[maybe_unused]] int flags) KResultOr<size_t> UDPSocket::protocol_receive(ReadonlyBytes raw_ipv4_packet, UserOrKernelBuffer& buffer, size_t buffer_size, [[maybe_unused]] int flags)

2
Kernel/Net/UDPSocket.h
View file

@ -14,7 +14,7 @@ namespace Kernel {
class UDPSocket final : public IPv4Socket { class UDPSocket final : public IPv4Socket {
public: public:
static KResultOr<NonnullRefPtr<UDPSocket>> create(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer); static KResultOr<NonnullRefPtr<UDPSocket>> try_create(int protocol, NonnullOwnPtr<DoubleBuffer> receive_buffer);
virtual ~UDPSocket() override; virtual ~UDPSocket() override;
static SocketHandle<UDPSocket> from_port(u16); static SocketHandle<UDPSocket> from_port(u16);