LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-06 11:09:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibCore: Use SystemServerTakeover functionality in LocalServer

Browse Source 
This removes the duplicate code in
LocalServer::take_over_from_system_server and replaces it with
Core::take_over_accepted_socket_from_system_server.
This commit is contained in:
sin-ack 2022-01-15 12:01:56 +00:00 committed by Andreas Kling
parent 259ed04087
commit f823648bae
Notes: sideshowbarker 2024-07-17 19:44:22 +09:00 
Author: https://github.com/sin-ack
Commit: https://github.com/SerenityOS/serenity/commit/f823648bae0
Pull-request: https://github.com/SerenityOS/serenity/pull/11910
1 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Userland/Libraries/LibCore/LocalServer.cpp
View File

@ -9,6 +9,7 @@
#include <LibCore/Notifier.h>
#include <LibCore/Stream.h>
#include <LibCore/System.h>
#include <LibCore/SystemServerTakeover.h>
#include <fcntl.h>
#include <stdio.h>
#include <sys/socket.h>
@ -37,39 +38,8 @@ ErrorOr<void> LocalServer::take_over_from_system_server(String const& socket_pat
if (m_listening)
return Error::from_string_literal("Core::LocalServer: Can't perform socket takeover when already listening"sv);
if (!LocalSocket::s_overtaken_sockets_parsed)
LocalSocket::parse_sockets_from_system_server();
int fd = -1;
if (socket_path.is_null()) {
// We want the first (and only) socket.
if (LocalSocket::s_overtaken_sockets.size() == 1) {
fd = LocalSocket::s_overtaken_sockets.begin()->value;
}
} else {
auto it = LocalSocket::s_overtaken_sockets.find(socket_path);
if (it != LocalSocket::s_overtaken_sockets.end()) {
fd = it->value;
}
}
if (fd < 0)
return Error::from_string_literal("Core::LocalServer: No file descriptor for socket takeover"sv);
// Sanity check: it has to be a socket.
auto stat = TRY(Core::System::fstat(fd));
if (!S_ISSOCK(stat.st_mode))
return Error::from_string_literal("Core::LocalServer: Attempted socket takeover with non-socket file descriptor"sv);
// It had to be !CLOEXEC for obvious reasons, but we
// don't need it to be !CLOEXEC anymore, so set the
// CLOEXEC flag now.
TRY(Core::System::fcntl(fd, F_SETFD, FD_CLOEXEC));
// The SystemServer has passed us the socket, so use that instead of
// creating our own.
m_fd = fd;
auto socket = TRY(take_over_socket_from_system_server(socket_path));
m_fd = TRY(socket->release_fd());
m_listening = true;
setup_notifier();