LibIPC+Services: Make ClientConnection take socket as NonnullRefPtr

This avoids getting into the awkward situation where the socket is
still part-owned by main() in multi-instance service. Also it just
reads nicer.

Libraries/LibIPC/ClientConnection.h

@@ -48,7 +48,7 @@ public:
         Invalid = 2000,
         Disconnected,
     };
-    Event() {}
+    Event() { }
     explicit Event(Type type)
         : Core::Event(type)
     {
@@ -78,19 +78,18 @@ NonnullRefPtr<T> new_client_connection(Args&&... args)
 template<typename Endpoint>
 class ClientConnection : public Core::Object {
 public:
-    ClientConnection(Endpoint& endpoint, Core::LocalSocket& socket, int client_id)
+    ClientConnection(Endpoint& endpoint, NonnullRefPtr<Core::LocalSocket> socket, int client_id)
         : m_endpoint(endpoint)
-        , m_socket(socket)
+        , m_socket(move(socket))
         , m_client_id(client_id)
     {
-        ASSERT(socket.is_connected());
+        ASSERT(m_socket->is_connected());
         ucred creds;
         socklen_t creds_size = sizeof(creds);
         if (getsockopt(m_socket->fd(), SOL_SOCKET, SO_PEERCRED, &creds, &creds_size) < 0) {
             ASSERT_NOT_REACHED();
         }
         m_client_pid = creds.pid;
-        add_child(socket);
         m_socket->on_ready_to_read = [this] { drain_messages_from_client(); };
 
         m_responsiveness_timer = Core::Timer::create_single_shot(3000, [this] { may_have_become_unresponsive(); });
@@ -100,8 +99,8 @@ public:
     {
     }
 
-    virtual void may_have_become_unresponsive() {}
-    virtual void did_become_responsive() {}
+    virtual void may_have_become_unresponsive() { }
+    virtual void did_become_responsive() { }
 
     void post_message(const Message& message)
     {
@@ -223,7 +222,7 @@ protected:
 
 private:
     Endpoint& m_endpoint;
-    RefPtr<Core::LocalSocket> m_socket;
+    NonnullRefPtr<Core::LocalSocket> m_socket;
     RefPtr<Core::Timer> m_responsiveness_timer;
     int m_client_id { -1 };
     int m_client_pid { -1 };

Services/AudioServer/ClientConnection.cpp

@@ -50,8 +50,8 @@ void ClientConnection::for_each(Function<void(ClientConnection&)> callback)
         callback(connection);
 }
 
-ClientConnection::ClientConnection(Core::LocalSocket& client_socket, int client_id, Mixer& mixer)
-    : IPC::ClientConnection<AudioServerEndpoint>(*this, client_socket, client_id)
+ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> client_socket, int client_id, Mixer& mixer)
+    : IPC::ClientConnection<AudioServerEndpoint>(*this, move(client_socket), client_id)
     , m_mixer(mixer)
 {
     s_connections.set(client_id, *this);

Services/AudioServer/ClientConnection.h

@@ -43,7 +43,7 @@ class ClientConnection final : public IPC::ClientConnection<AudioServerEndpoint>
     , public AudioServerEndpoint {
     C_OBJECT(ClientConnection)
 public:
-    explicit ClientConnection(Core::LocalSocket&, int client_id, Mixer& mixer);
+    explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id, Mixer& mixer);
     ~ClientConnection() override;
 
     void did_finish_playing_buffer(Badge<BufferQueue>, int buffer_id);

Services/AudioServer/main.cpp

@@ -49,7 +49,7 @@ int main(int, char**)
         }
         static int s_next_client_id = 0;
         int client_id = ++s_next_client_id;
-        IPC::new_client_connection<AudioServer::ClientConnection>(*client_socket, client_id, mixer);
+        IPC::new_client_connection<AudioServer::ClientConnection>(client_socket.release_nonnull(), client_id, mixer);
     };
 
     if (pledge("stdio thread shared_buffer accept", nullptr) < 0) {

Services/Clipboard/ClientConnection.cpp

@@ -41,8 +41,8 @@ void ClientConnection::for_each_client(Function<void(ClientConnection&)> callbac
     }
 }
 
-ClientConnection::ClientConnection(Core::LocalSocket& socket, int client_id)
-    : IPC::ClientConnection<ClipboardServerEndpoint>(*this, socket, client_id)
+ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket, int client_id)
+    : IPC::ClientConnection<ClipboardServerEndpoint>(*this, move(socket), client_id)
 {
     s_connections.set(client_id, *this);
 }

Services/Clipboard/ClientConnection.h

@@ -37,7 +37,7 @@ class ClientConnection final : public IPC::ClientConnection<ClipboardServerEndpo
     C_OBJECT(ClientConnection);
 
 public:
-    explicit ClientConnection(Core::LocalSocket&, int client_id);
+    explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id);
     virtual ~ClientConnection() override;
 
     virtual void die() override;

Services/Clipboard/main.cpp

@@ -63,7 +63,7 @@ int main(int, char**)
         }
         static int s_next_client_id = 0;
         int client_id = ++s_next_client_id;
-        IPC::new_client_connection<Clipboard::ClientConnection>(*client_socket, client_id);
+        IPC::new_client_connection<Clipboard::ClientConnection>(client_socket.release_nonnull(), client_id);
     };
 
     Clipboard::Storage::the().on_content_change = [&] {

Services/ImageDecoder/CMakeLists.txt

@@ -9,4 +9,4 @@ set(SOURCES
 )
 
 serenity_bin(ImageDecoder)
-target_link_libraries(ImageDecoder LibIPC LibGfx)
+target_link_libraries(ImageDecoder LibGfx LibIPC)

Services/ImageDecoder/ClientConnection.cpp

@@ -36,8 +36,8 @@ namespace ImageDecoder {
 
 static HashMap<int, RefPtr<ClientConnection>> s_connections;
 
-ClientConnection::ClientConnection(Core::LocalSocket& socket, int client_id)
-    : IPC::ClientConnection<ImageDecoderServerEndpoint>(*this, socket, client_id)
+ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket, int client_id)
+    : IPC::ClientConnection<ImageDecoderServerEndpoint>(*this, move(socket), client_id)
 {
     s_connections.set(client_id, *this);
 }

Services/ImageDecoder/ClientConnection.h

@@ -40,7 +40,7 @@ class ClientConnection final
     C_OBJECT(ClientConnection);
 
 public:
-    explicit ClientConnection(Core::LocalSocket&, int client_id);
+    explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id);
     ~ClientConnection() override;
 
     virtual void die() override;

Services/ImageDecoder/main.cpp

@@ -42,7 +42,7 @@ int main(int, char**)
     }
 
     auto socket = Core::LocalSocket::take_over_accepted_socket_from_system_server();
-    IPC::new_client_connection<ImageDecoder::ClientConnection>(*socket, 1);
+    IPC::new_client_connection<ImageDecoder::ClientConnection>(socket.release_nonnull(), 1);
     if (pledge("stdio shared_buffer", nullptr) < 0) {
         perror("pledge");
         return 1;

Services/LaunchServer/ClientConnection.cpp

@@ -33,8 +33,8 @@
 namespace LaunchServer {
 
 static HashMap<int, RefPtr<ClientConnection>> s_connections;
-ClientConnection::ClientConnection(Core::LocalSocket& client_socket, int client_id)
-    : IPC::ClientConnection<LaunchServerEndpoint>(*this, client_socket, client_id)
+ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> client_socket, int client_id)
+    : IPC::ClientConnection<LaunchServerEndpoint>(*this, move(client_socket), client_id)
 {
     s_connections.set(client_id, *this);
 }

Services/LaunchServer/ClientConnection.h

@@ -40,7 +40,7 @@ public:
     virtual void die() override;
 
 private:
-    explicit ClientConnection(Core::LocalSocket&, int client_id);
+    explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id);
 
     virtual OwnPtr<Messages::LaunchServer::GreetResponse> handle(const Messages::LaunchServer::Greet&) override;
     virtual OwnPtr<Messages::LaunchServer::OpenURLResponse> handle(const Messages::LaunchServer::OpenURL&) override;

Services/LaunchServer/main.cpp

@@ -61,7 +61,7 @@ int main(int argc, char** argv)
         static int s_next_client_id = 0;
         int client_id = ++s_next_client_id;
         dbg() << "Received connection";
-        IPC::new_client_connection<LaunchServer::ClientConnection>(*client_socket, client_id);
+        IPC::new_client_connection<LaunchServer::ClientConnection>(client_socket.release_nonnull(), client_id);
     };
 
     return event_loop.exec();

Services/NotificationServer/ClientConnection.cpp

@@ -33,8 +33,8 @@ namespace NotificationServer {
 
 static HashMap<int, RefPtr<ClientConnection>> s_connections;
 
-ClientConnection::ClientConnection(Core::LocalSocket& client_socket, int client_id)
-    : IPC::ClientConnection<NotificationServerEndpoint>(*this, client_socket, client_id)
+ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> client_socket, int client_id)
+    : IPC::ClientConnection<NotificationServerEndpoint>(*this, move(client_socket), client_id)
 {
     s_connections.set(client_id, *this);
 }

Services/NotificationServer/ClientConnection.h

@@ -40,7 +40,7 @@ public:
     virtual void die() override;
 
 private:
-    explicit ClientConnection(Core::LocalSocket&, int client_id);
+    explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id);
 
     virtual OwnPtr<Messages::NotificationServer::GreetResponse> handle(const Messages::NotificationServer::Greet&) override;
     virtual OwnPtr<Messages::NotificationServer::ShowNotificationResponse> handle(const Messages::NotificationServer::ShowNotification&) override;

Services/NotificationServer/main.cpp

@@ -52,7 +52,7 @@ int main(int argc, char** argv)
         }
         static int s_next_client_id = 0;
         int client_id = ++s_next_client_id;
-        IPC::new_client_connection<NotificationServer::ClientConnection>(*client_socket, client_id);
+        IPC::new_client_connection<NotificationServer::ClientConnection>(client_socket.release_nonnull(), client_id);
     };
 
     if (unveil("/res", "r") < 0) {

Services/ProtocolServer/ClientConnection.cpp

@@ -35,8 +35,8 @@ namespace ProtocolServer {
 
 static HashMap<int, RefPtr<ClientConnection>> s_connections;
 
-ClientConnection::ClientConnection(Core::LocalSocket& socket, int client_id)
-    : IPC::ClientConnection<ProtocolServerEndpoint>(*this, socket, client_id)
+ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket, int client_id)
+    : IPC::ClientConnection<ProtocolServerEndpoint>(*this, move(socket), client_id)
 {
     s_connections.set(client_id, *this);
 }

Services/ProtocolServer/ClientConnection.h

@@ -39,7 +39,7 @@ class ClientConnection final
     C_OBJECT(ClientConnection);
 
 public:
-    explicit ClientConnection(Core::LocalSocket&, int client_id);
+    explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id);
     ~ClientConnection() override;
 
     virtual void die() override;

Services/WebContent/ClientConnection.cpp

@@ -36,8 +36,8 @@ namespace WebContent {
 
 static HashMap<int, RefPtr<ClientConnection>> s_connections;
 
-ClientConnection::ClientConnection(Core::LocalSocket& socket, int client_id)
-    : IPC::ClientConnection<WebContentServerEndpoint>(*this, socket, client_id)
+ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> socket, int client_id)
+    : IPC::ClientConnection<WebContentServerEndpoint>(*this, move(socket), client_id)
     , m_page_host(PageHost::create(*this))
 {
     s_connections.set(client_id, *this);

Services/WebContent/ClientConnection.h

@@ -40,7 +40,7 @@ class ClientConnection final
     C_OBJECT(ClientConnection);
 
 public:
-    explicit ClientConnection(Core::LocalSocket&, int client_id);
+    explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id);
     ~ClientConnection() override;
 
     virtual void die() override;

Services/WebContent/main.cpp

@@ -54,6 +54,7 @@ int main(int, char**)
     }
 
     auto socket = Core::LocalSocket::take_over_accepted_socket_from_system_server();
-    IPC::new_client_connection<WebContent::ClientConnection>(*socket, 1);
+    ASSERT(socket);
+    IPC::new_client_connection<WebContent::ClientConnection>(socket.release_nonnull(), 1);
     return event_loop.exec();
 }

Services/WindowServer/ClientConnection.cpp

@@ -77,8 +77,8 @@ ClientConnection* ClientConnection::from_client_id(int client_id)
     return (*it).value.ptr();
 }
 
-ClientConnection::ClientConnection(Core::LocalSocket& client_socket, int client_id)
-    : IPC::ClientConnection<WindowServerEndpoint>(*this, client_socket, client_id)
+ClientConnection::ClientConnection(NonnullRefPtr<Core::LocalSocket> client_socket, int client_id)
+    : IPC::ClientConnection<WindowServerEndpoint>(*this, move(client_socket), client_id)
 {
     if (!s_connections)
         s_connections = new HashMap<int, NonnullRefPtr<ClientConnection>>;

Services/WindowServer/ClientConnection.h

@@ -84,7 +84,7 @@ public:
     void notify_display_link(Badge<Compositor>);
 
 private:
-    explicit ClientConnection(Core::LocalSocket&, int client_id);
+    explicit ClientConnection(NonnullRefPtr<Core::LocalSocket>, int client_id);
 
     // ^ClientConnection
     virtual void die() override;

Services/WindowServer/EventLoop.cpp

@@ -63,7 +63,7 @@ EventLoop::EventLoop()
         }
         static int s_next_client_id = 0;
         int client_id = ++s_next_client_id;
-        IPC::new_client_connection<ClientConnection>(*client_socket, client_id);
+        IPC::new_client_connection<ClientConnection>(client_socket.release_nonnull(), client_id);
     };
 
     ASSERT(m_keyboard_fd >= 0);