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

LibCore: Make LocalSocket takeover mechanism return ErrorOr<T>

Browse source
This commit is contained in:
Andreas Kling 2021-11-23 11:14:40 +01:00
parent c37a02341b
commit c1a3968c66
9 changed files with 26 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Libraries/LibCore/LocalSocket.cpp
View file

@ -5,12 +5,13 @@
*/
#include <LibCore/LocalSocket.h>
#include <LibCore/System.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/socket.h>
#include <sys/stat.h>
#if defined(__FreeBSD__)
# include <sys/ucred.h>
#endif
@ -114,7 +115,7 @@ void LocalSocket::parse_sockets_from_system_server()
unsetenv(socket_takeover);
}
RefPtr<LocalSocket> LocalSocket::take_over_accepted_socket_from_system_server(String const& socket_path)
ErrorOr<NonnullRefPtr<LocalSocket>> LocalSocket::take_over_accepted_socket_from_system_server(String const& socket_path)
{
if (!s_overtaken_sockets_parsed)
parse_sockets_from_system_server();
@ -126,29 +127,24 @@ RefPtr<LocalSocket> LocalSocket::take_over_accepted_socket_from_system_server(St
fd = s_overtaken_sockets.begin()->value;
} else {
auto it = s_overtaken_sockets.find(socket_path);
if (it == s_overtaken_sockets.end()) {
dbgln("Non-existent socket requested");
return nullptr;
}
if (it == s_overtaken_sockets.end())
return Error::from_string_literal("Non-existent socket requested"sv);
fd = it->value;
}
// Sanity check: it has to be a socket.
struct stat stat;
int rc = fstat(fd, &stat);
if (rc < 0 || !S_ISSOCK(stat.st_mode)) {
if (rc != 0)
perror("fstat");
dbgln("ERROR: The fd we got from SystemServer is not a socket");
return nullptr;
}
auto stat = TRY(Core::System::fstat(fd));
if (!S_ISSOCK(stat.st_mode))
return Error::from_string_literal("The fd we got from SystemServer is not a socket"sv);
auto socket = LocalSocket::construct(fd);
// It had to be !CLOEXEC for obvious reasons, but we
// don't need it to be !CLOEXEC anymore, so set the
// CLOEXEC flag now.
fcntl(fd, F_SETFD, FD_CLOEXEC);
TRY(Core::System::fcntl(fd, F_SETFD, FD_CLOEXEC));
return socket;
}