mirror of
https://github.com/RGBCube/serenity
synced 2025-07-23 19:37:34 +00:00
LibCore: Remove Core::LocalSocket :^)
This commit is contained in:
parent
0249c92313
commit
04d68117c2
6 changed files with 0 additions and 193 deletions
|
@ -7,7 +7,6 @@
|
||||||
#include <AK/Format.h>
|
#include <AK/Format.h>
|
||||||
#include <LibCore/EventLoop.h>
|
#include <LibCore/EventLoop.h>
|
||||||
#include <LibCore/LocalServer.h>
|
#include <LibCore/LocalServer.h>
|
||||||
#include <LibCore/LocalSocket.h>
|
|
||||||
#include <LibCore/Stream.h>
|
#include <LibCore/Stream.h>
|
||||||
#include <LibCore/TCPServer.h>
|
#include <LibCore/TCPServer.h>
|
||||||
#include <LibCore/TCPSocket.h>
|
#include <LibCore/TCPSocket.h>
|
||||||
|
|
|
@ -16,7 +16,6 @@ set(SOURCES
|
||||||
Group.cpp
|
Group.cpp
|
||||||
IODevice.cpp
|
IODevice.cpp
|
||||||
LocalServer.cpp
|
LocalServer.cpp
|
||||||
LocalSocket.cpp
|
|
||||||
LockFile.cpp
|
LockFile.cpp
|
||||||
MappedFile.cpp
|
MappedFile.cpp
|
||||||
MimeData.cpp
|
MimeData.cpp
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
#include <LibCore/Event.h>
|
#include <LibCore/Event.h>
|
||||||
#include <LibCore/EventLoop.h>
|
#include <LibCore/EventLoop.h>
|
||||||
#include <LibCore/LocalServer.h>
|
#include <LibCore/LocalServer.h>
|
||||||
#include <LibCore/LocalSocket.h>
|
|
||||||
#include <LibCore/Notifier.h>
|
#include <LibCore/Notifier.h>
|
||||||
#include <LibCore/Object.h>
|
#include <LibCore/Object.h>
|
||||||
#include <LibThreading/Mutex.h>
|
#include <LibThreading/Mutex.h>
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <LibCore/LocalServer.h>
|
#include <LibCore/LocalServer.h>
|
||||||
#include <LibCore/LocalSocket.h>
|
|
||||||
#include <LibCore/Notifier.h>
|
#include <LibCore/Notifier.h>
|
||||||
#include <LibCore/Stream.h>
|
#include <LibCore/Stream.h>
|
||||||
#include <LibCore/System.h>
|
#include <LibCore/System.h>
|
||||||
|
|
|
@ -1,154 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <LibCore/LocalSocket.h>
|
|
||||||
#include <LibCore/System.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
|
|
||||||
#if defined(__FreeBSD__)
|
|
||||||
# include <sys/ucred.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef SOCK_NONBLOCK
|
|
||||||
# include <sys/ioctl.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace Core {
|
|
||||||
|
|
||||||
LocalSocket::LocalSocket(int fd, Object* parent)
|
|
||||||
: Socket(Socket::Type::Local, parent)
|
|
||||||
{
|
|
||||||
// NOTE: This constructor is used by LocalServer::accept(), so the socket is already connected.
|
|
||||||
m_connected = true;
|
|
||||||
set_fd(fd);
|
|
||||||
set_mode(OpenMode::ReadWrite);
|
|
||||||
set_error(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
LocalSocket::LocalSocket(Object* parent)
|
|
||||||
: Socket(Socket::Type::Local, parent)
|
|
||||||
{
|
|
||||||
#ifdef SOCK_NONBLOCK
|
|
||||||
int fd = socket(AF_LOCAL, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
|
|
||||||
#else
|
|
||||||
int fd = socket(AF_LOCAL, SOCK_STREAM, 0);
|
|
||||||
int option = 1;
|
|
||||||
ioctl(fd, FIONBIO, &option);
|
|
||||||
fcntl(fd, F_SETFD, FD_CLOEXEC);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (fd < 0) {
|
|
||||||
set_error(errno);
|
|
||||||
} else {
|
|
||||||
set_fd(fd);
|
|
||||||
set_mode(OpenMode::ReadWrite);
|
|
||||||
set_error(0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
LocalSocket::~LocalSocket()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
pid_t LocalSocket::peer_pid() const
|
|
||||||
{
|
|
||||||
#ifdef AK_OS_MACOS
|
|
||||||
pid_t pid;
|
|
||||||
socklen_t pid_size = sizeof(pid);
|
|
||||||
#elif defined(__FreeBSD__)
|
|
||||||
struct xucred creds = {};
|
|
||||||
socklen_t creds_size = sizeof(creds);
|
|
||||||
#elif defined(__OpenBSD__)
|
|
||||||
struct sockpeercred creds = {};
|
|
||||||
socklen_t creds_size = sizeof(creds);
|
|
||||||
#else
|
|
||||||
struct ucred creds = {};
|
|
||||||
socklen_t creds_size = sizeof(creds);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef AK_OS_MACOS
|
|
||||||
if (getsockopt(fd(), SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) < 0) {
|
|
||||||
#elif defined(__FreeBSD__)
|
|
||||||
if (getsockopt(fd(), SOL_LOCAL, LOCAL_PEERCRED, &creds, &creds_size) < 0) {
|
|
||||||
#else
|
|
||||||
if (getsockopt(fd(), SOL_SOCKET, SO_PEERCRED, &creds, &creds_size) < 0) {
|
|
||||||
#endif
|
|
||||||
dbgln("LocalSocket: getsockopt failed, {}", strerror(errno));
|
|
||||||
VERIFY_NOT_REACHED();
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef AK_OS_MACOS
|
|
||||||
return pid;
|
|
||||||
#elif defined(__FreeBSD__)
|
|
||||||
return creds.cr_pid;
|
|
||||||
#else
|
|
||||||
return creds.pid;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
HashMap<String, int> LocalSocket::s_overtaken_sockets {};
|
|
||||||
bool LocalSocket::s_overtaken_sockets_parsed { false };
|
|
||||||
|
|
||||||
void LocalSocket::parse_sockets_from_system_server()
|
|
||||||
{
|
|
||||||
VERIFY(!s_overtaken_sockets_parsed);
|
|
||||||
|
|
||||||
constexpr auto socket_takeover = "SOCKET_TAKEOVER";
|
|
||||||
const char* sockets = getenv(socket_takeover);
|
|
||||||
if (!sockets) {
|
|
||||||
s_overtaken_sockets_parsed = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (auto& socket : StringView(sockets).split_view(' ')) {
|
|
||||||
auto params = socket.split_view(':');
|
|
||||||
s_overtaken_sockets.set(params[0].to_string(), strtol(params[1].to_string().characters(), nullptr, 10));
|
|
||||||
}
|
|
||||||
|
|
||||||
s_overtaken_sockets_parsed = true;
|
|
||||||
// We wouldn't want our children to think we're passing
|
|
||||||
// them a socket either, so unset the env variable.
|
|
||||||
unsetenv(socket_takeover);
|
|
||||||
}
|
|
||||||
|
|
||||||
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();
|
|
||||||
|
|
||||||
int fd;
|
|
||||||
if (socket_path.is_null()) {
|
|
||||||
// We want the first (and only) socket.
|
|
||||||
VERIFY(s_overtaken_sockets.size() == 1);
|
|
||||||
fd = s_overtaken_sockets.begin()->value;
|
|
||||||
} else {
|
|
||||||
auto it = s_overtaken_sockets.find(socket_path);
|
|
||||||
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.
|
|
||||||
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.
|
|
||||||
TRY(Core::System::fcntl(fd, F_SETFD, FD_CLOEXEC));
|
|
||||||
|
|
||||||
return socket;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,35 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <LibCore/Socket.h>
|
|
||||||
|
|
||||||
namespace Core {
|
|
||||||
|
|
||||||
class LocalSocket final : public Socket {
|
|
||||||
C_OBJECT(LocalSocket)
|
|
||||||
public:
|
|
||||||
virtual ~LocalSocket() override;
|
|
||||||
|
|
||||||
static ErrorOr<NonnullRefPtr<LocalSocket>> take_over_accepted_socket_from_system_server(String const& socket_path = String());
|
|
||||||
pid_t peer_pid() const;
|
|
||||||
|
|
||||||
private:
|
|
||||||
explicit LocalSocket(Object* parent = nullptr);
|
|
||||||
LocalSocket(int fd, Object* parent = nullptr);
|
|
||||||
|
|
||||||
// FIXME: better place to put this so both LocalSocket and LocalServer can
|
|
||||||
// enjoy it?
|
|
||||||
friend class LocalServer;
|
|
||||||
|
|
||||||
static void parse_sockets_from_system_server();
|
|
||||||
|
|
||||||
static HashMap<String, int> s_overtaken_sockets;
|
|
||||||
static bool s_overtaken_sockets_parsed;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue