RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 18:28:12 +00:00
Code Issues Activity Actions

LibCore: Remove the SocketError class

Browse source 
SocketError is a relic from the KResult days when we couldn't have a
string in the KResult type, only an errno. Now that we can use string
literals with Error, it's no longer necessary. gai_strerror is thread
safe, so we can use it here unlike strerror.
This commit is contained in:
sin-ack 2021-12-18 11:37:22 +00:00 • committed by Ali Mohammad Pur
parent 28063de488
commit eb389db92c
2 changed files with 17 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Userland/Libraries/LibCore/Stream.cpp
View file

@ -273,7 +273,7 @@ ErrorOr<int> Socket::create_fd(SocketDomain domain, SocketType type)
return rc;
}
Result<IPv4Address, SocketError> Socket::resolve_host(String const& host, SocketType type)
ErrorOr<IPv4Address> Socket::resolve_host(String const& host, SocketType type)
{
int socket_type;
switch (type) {
@ -297,13 +297,13 @@ Result<IPv4Address, SocketError> Socket::resolve_host(String const& host, Socket
int rc = getaddrinfo(host.characters(), nullptr, &hints, &results);
if (rc != 0) {
if (rc == EAI_SYSTEM) {
return SocketError { Error::from_errno(errno) };
} else {
return SocketError { static_cast<GetAddrInfoError>(rc) };
return Error::from_errno(errno);
}
return Error::from_string_literal(gai_strerror(rc));
}
auto socket_address = bit_cast<struct sockaddr_in*>(results->ai_addr);
auto* socket_address = bit_cast<struct sockaddr_in*>(results->ai_addr);
NetworkOrdered<u32> network_ordered_address { socket_address->sin_addr.s_addr };
freeaddrinfo(results);
@ -445,15 +445,10 @@ void PosixSocketHelper::setup_notifier()
m_notifier = Core::Notifier::construct(m_fd, Core::Notifier::Read);
}
Result<TCPSocket, SocketError> TCPSocket::connect(String const& host, u16 port)
ErrorOr<TCPSocket> TCPSocket::connect(String const& host, u16 port)
{
auto ip_address = TRY(resolve_host(host, SocketType::Stream));
auto maybe_socket = connect(SocketAddress { ip_address, port });
if (maybe_socket.is_error()) {
return SocketError { maybe_socket.release_error() };
}
return maybe_socket.release_value();
return connect(SocketAddress { ip_address, port });
}
ErrorOr<TCPSocket> TCPSocket::connect(SocketAddress const& address)
@ -500,14 +495,10 @@ ErrorOr<size_t> PosixSocketHelper::pending_bytes() const
return static_cast<size_t>(value);
}
Result<UDPSocket, SocketError> UDPSocket::connect(String const& host, u16 port)
ErrorOr<UDPSocket> UDPSocket::connect(String const& host, u16 port)
{
auto ip_address = TRY(resolve_host(host, SocketType::Datagram));
auto maybe_socket = connect(SocketAddress { ip_address, port });
if (maybe_socket.is_error()) {
return SocketError { maybe_socket.release_error() };
}
return maybe_socket.release_value();
return connect(SocketAddress { ip_address, port });
}
ErrorOr<UDPSocket> UDPSocket::connect(SocketAddress const& address)