diff --git a/Libraries/LibIPC/ConnectionToServer.h b/Libraries/LibIPC/ConnectionToServer.h index a45d18171fe..2a55528e304 100644 --- a/Libraries/LibIPC/ConnectionToServer.h +++ b/Libraries/LibIPC/ConnectionToServer.h @@ -11,20 +11,6 @@ namespace IPC { -#define IPC_CLIENT_CONNECTION(klass, socket_path) \ - C_OBJECT_ABSTRACT(klass) \ -public: \ - template \ - static ErrorOr> try_create(Args&&... args) \ - { \ - auto parsed_socket_path = TRY(Core::SessionManagement::parse_path_with_sid(socket_path)); \ - auto socket = TRY(Core::LocalSocket::connect(move(parsed_socket_path))); \ - /* We want to rate-limit our clients */ \ - TRY(socket->set_blocking(true)); \ - \ - return adopt_nonnull_ref_or_enomem(new (nothrow) Klass(IPC::Transport(move(socket)), forward(args)...)); \ - } - template class ConnectionToServer : public IPC::Connection , public ClientEndpoint::Stub diff --git a/Libraries/LibImageDecoderClient/Client.h b/Libraries/LibImageDecoderClient/Client.h index 0a0e46f3f53..5af4811165d 100644 --- a/Libraries/LibImageDecoderClient/Client.h +++ b/Libraries/LibImageDecoderClient/Client.h @@ -29,7 +29,7 @@ struct DecodedImage { class Client final : public IPC::ConnectionToServer , public ImageDecoderClientEndpoint { - IPC_CLIENT_CONNECTION(Client, "/tmp/session/%sid/portal/image"sv); + C_OBJECT_ABSTRACT(Client); public: Client(IPC::Transport); diff --git a/Libraries/LibRequests/RequestClient.h b/Libraries/LibRequests/RequestClient.h index 0592c97d450..6d82a616755 100644 --- a/Libraries/LibRequests/RequestClient.h +++ b/Libraries/LibRequests/RequestClient.h @@ -21,7 +21,7 @@ class Request; class RequestClient final : public IPC::ConnectionToServer , public RequestClientEndpoint { - IPC_CLIENT_CONNECTION(RequestClient, "/tmp/session/%sid/portal/request"sv) + C_OBJECT_ABSTRACT(RequestClient) public: explicit RequestClient(IPC::Transport); diff --git a/Libraries/LibWeb/Worker/WebWorkerClient.h b/Libraries/LibWeb/Worker/WebWorkerClient.h index 540904e0bf9..e1f4df0f3c4 100644 --- a/Libraries/LibWeb/Worker/WebWorkerClient.h +++ b/Libraries/LibWeb/Worker/WebWorkerClient.h @@ -16,7 +16,7 @@ namespace Web::HTML { class WebWorkerClient final : public IPC::ConnectionToServer , public WebWorkerClientEndpoint { - IPC_CLIENT_CONNECTION(WebWorkerClient, "/tmp/session/%sid/portal/webworker"sv); + C_OBJECT_ABSTRACT(WebWorkerClient); public: explicit WebWorkerClient(IPC::Transport); diff --git a/Libraries/LibWebView/WebContentClient.h b/Libraries/LibWebView/WebContentClient.h index b03c38553c9..9480432a908 100644 --- a/Libraries/LibWebView/WebContentClient.h +++ b/Libraries/LibWebView/WebContentClient.h @@ -26,7 +26,7 @@ class ViewImplementation; class WebContentClient final : public IPC::ConnectionToServer , public WebContentClientEndpoint { - IPC_CLIENT_CONNECTION(WebContentClient, "/tmp/session/%sid/portal/webcontent"sv); + C_OBJECT_ABSTRACT(WebContentClient); public: static Optional view_for_pid_and_page_id(pid_t pid, u64 page_id);