RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 10:17:34 +00:00
Code Issues Activity Actions

LibIPC: Add IPC::take_over_accepted_client_from_system_server<Client>()

Browse source 
This is an encapsulation of the common work done by all of our
single-client IPC servers on startup:

    1. Create a Core::LocalSocket, taking over an accepted fd.
    2. Create an application-specific ClientConnection object,
       wrapping the socket.

It's not a huge change in terms of lines saved, but I do feel that it
improves expressiveness. :^)
This commit is contained in:
Andreas Kling 2021-12-06 18:11:05 +01:00
parent 6d0f504822
commit 971b3645ef
18 changed files with 58 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Services/FileSystemAccessServer/ClientConnection.cpp
View file

@ -20,10 +20,10 @@ namespace FileSystemAccessServer {
static HashMap<int, NonnullRefPtr<ClientConnection>> s_connections;
ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket, int client_id)
: IPC::ClientConnection<FileSystemAccessClientEndpoint, FileSystemAccessServerEndpoint>(*this, move(socket), client_id)
ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket)
: IPC::ClientConnection<FileSystemAccessClientEndpoint, FileSystemAccessServerEndpoint>(*this, move(socket), 1)
{
s_connections.set(client_id, *this);
s_connections.set(1, *this);
}
ClientConnection::~ClientConnection()

2
Userland/Services/FileSystemAccessServer/ClientConnection.h
View file

@ -25,7 +25,7 @@ public:
virtual void die() override;
private:
explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id);
explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>);
virtual void request_file_read_only_approved(i32, i32, String const&) override;
virtual void request_file(i32, i32, String const&, Core::OpenMode const&) override;

6
Userland/Services/FileSystemAccessServer/main.cpp
View file

@ -5,10 +5,9 @@
*/
#include <FileSystemAccessServer/ClientConnection.h>
#include <LibCore/LocalServer.h>
#include <LibCore/System.h>
#include <LibGUI/Application.h>
#include <LibIPC/ClientConnection.h>
#include <LibIPC/SingleServer.h>
#include <LibMain/Main.h>
ErrorOr<int> serenity_main(Main::Arguments)
@ -18,7 +17,6 @@ ErrorOr<int> serenity_main(Main::Arguments)
auto app = GUI::Application::construct(0, nullptr);
app->set_quit_when_last_window_deleted(false);
auto socket = TRY(Core::LocalSocket::take_over_accepted_socket_from_system_server());
(void)IPC::new_client_connection<FileSystemAccessServer::ClientConnection>(move(socket), 1);
auto client = TRY(IPC::take_over_accepted_client_from_system_server<FileSystemAccessServer::ClientConnection>());
return app->exec();
}

7
Userland/Services/ImageDecoder/main.cpp
View file

@ -6,9 +6,8 @@
#include <ImageDecoder/ClientConnection.h>
#include <LibCore/EventLoop.h>
#include <LibCore/LocalServer.h>
#include <LibCore/System.h>
#include <LibIPC/ClientConnection.h>
#include <LibIPC/SingleServer.h>
#include <LibMain/Main.h>
ErrorOr<int> serenity_main(Main::Arguments)
@ -17,8 +16,8 @@ ErrorOr<int> serenity_main(Main::Arguments)
TRY(Core::System::pledge("stdio recvfd sendfd unix"));
TRY(Core::System::unveil(nullptr, nullptr));
auto socket = TRY(Core::LocalSocket::take_over_accepted_socket_from_system_server());
auto client = IPC::new_client_connection<ImageDecoder::ClientConnection>(move(socket));
auto client = TRY(IPC::take_over_accepted_client_from_system_server<ImageDecoder::ClientConnection>());
TRY(Core::System::pledge("stdio recvfd sendfd"));
return event_loop.exec();
}

6
Userland/Services/RequestServer/ClientConnection.cpp
View file

@ -15,10 +15,10 @@ namespace RequestServer {
static HashMap<int, RefPtr<ClientConnection>> s_connections;
ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket, int client_id)
: IPC::ClientConnection<RequestClientEndpoint, RequestServerEndpoint>(*this, move(socket), client_id)
ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket)
: IPC::ClientConnection<RequestClientEndpoint, RequestServerEndpoint>(*this, move(socket), 1)
{
s_connections.set(client_id, *this);
s_connections.set(1, *this);
}
ClientConnection::~ClientConnection()

2
Userland/Services/RequestServer/ClientConnection.h
View file

@ -29,7 +29,7 @@ public:
void did_request_certificates(Badge<Request>, Request&);
private:
explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id);
explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>);
virtual Messages::RequestServer::IsSupportedProtocolResponse is_supported_protocol(String const&) override;
virtual Messages::RequestServer::StartRequestResponse start_request(String const&, URL const&, IPC::Dictionary const&, ByteBuffer const&) override;

6
Userland/Services/RequestServer/main.cpp
View file

@ -8,7 +8,7 @@
#include <LibCore/EventLoop.h>
#include <LibCore/LocalServer.h>
#include <LibCore/System.h>
#include <LibIPC/ClientConnection.h>
#include <LibIPC/SingleServer.h>
#include <LibMain/Main.h>
#include <LibTLS/Certificate.h>
#include <RequestServer/ClientConnection.h>
@ -36,8 +36,8 @@ ErrorOr<int> serenity_main(Main::Arguments)
[[maybe_unused]] auto http = make<RequestServer::HttpProtocol>();
[[maybe_unused]] auto https = make<RequestServer::HttpsProtocol>();
auto socket = TRY(Core::LocalSocket::take_over_accepted_socket_from_system_server());
(void)IPC::new_client_connection<RequestServer::ClientConnection>(move(socket), 1);
auto client = TRY(IPC::take_over_accepted_client_from_system_server<RequestServer::ClientConnection>());
auto result = event_loop.exec();
// FIXME: We exit instead of returning, so that protocol destructors don't get called.

5
Userland/Services/WebContent/main.cpp
View file

@ -7,7 +7,7 @@
#include <LibCore/EventLoop.h>
#include <LibCore/LocalServer.h>
#include <LibCore/System.h>
#include <LibIPC/ClientConnection.h>
#include <LibIPC/SingleServer.h>
#include <LibMain/Main.h>
#include <WebContent/ClientConnection.h>
@ -21,7 +21,6 @@ ErrorOr<int> serenity_main(Main::Arguments)
TRY(Core::System::unveil("/tmp/portal/websocket", "rw"));
TRY(Core::System::unveil(nullptr, nullptr));
auto socket = TRY(Core::LocalSocket::take_over_accepted_socket_from_system_server());
auto client = IPC::new_client_connection<WebContent::ClientConnection>(move(socket));
auto client = IPC::take_over_accepted_client_from_system_server<WebContent::ClientConnection>();
return event_loop.exec();
}

6
Userland/Services/WebSocket/ClientConnection.cpp
View file

@ -13,10 +13,10 @@ namespace WebSocket {
static HashMap<int, RefPtr<ClientConnection>> s_connections;
ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket, int client_id)
: IPC::ClientConnection<WebSocketClientEndpoint, WebSocketServerEndpoint>(*this, move(socket), client_id)
ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket)
: IPC::ClientConnection<WebSocketClientEndpoint, WebSocketServerEndpoint>(*this, move(socket), 1)
{
s_connections.set(client_id, *this);
s_connections.set(1, *this);
}
ClientConnection::~ClientConnection()

2
Userland/Services/WebSocket/ClientConnection.h
View file

@ -24,7 +24,7 @@ public:
virtual void die() override;
private:
explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id);
explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>);
virtual Messages::WebSocketServer::ConnectResponse connect(URL const&, String const&, Vector<String> const&, Vector<String> const&, IPC::Dictionary const&) override;
virtual Messages::WebSocketServer::ReadyStateResponse ready_state(i32) override;

6
Userland/Services/WebSocket/main.cpp
View file

@ -7,7 +7,7 @@
#include <LibCore/EventLoop.h>
#include <LibCore/LocalServer.h>
#include <LibCore/System.h>
#include <LibIPC/ClientConnection.h>
#include <LibIPC/SingleServer.h>
#include <LibMain/Main.h>
#include <LibTLS/Certificate.h>
#include <WebSocket/ClientConnection.h>
@ -25,7 +25,7 @@ ErrorOr<int> serenity_main(Main::Arguments)
TRY(Core::System::unveil("/tmp/portal/lookup", "rw"));
TRY(Core::System::unveil(nullptr, nullptr));
auto socket = TRY(Core::LocalSocket::take_over_accepted_socket_from_system_server());
(void)IPC::new_client_connection<WebSocket::ClientConnection>(move(socket), 1);
auto client = TRY(IPC::take_over_accepted_client_from_system_server<WebSocket::ClientConnection>());
return event_loop.exec();
}