LibIPC: Rename base classes to IClientConnection and IServerConnection

This matches what we're already calling the server-side subclasses
better, though we'll probably want to find some better names for the
client-side classes eventually.

Libraries/LibAudio/AClientConnection.cpp

@@ -3,7 +3,7 @@
 #include <SharedBuffer.h>
 
 AClientConnection::AClientConnection()
-    : ConnectionNG(*this, "/tmp/portal/audio")
+    : IServerConnection(*this, "/tmp/portal/audio")
 {
 }
 

Libraries/LibAudio/AClientConnection.h

@@ -6,7 +6,7 @@
 
 class ABuffer;
 
-class AClientConnection : public IPC::Client::ConnectionNG<AudioClientEndpoint, AudioServerEndpoint>
+class AClientConnection : public IServerConnection<AudioClientEndpoint, AudioServerEndpoint>
     , public AudioClientEndpoint {
     C_OBJECT(AClientConnection)
 public:

Libraries/LibGUI/GWindowServerConnection.h

@@ -5,12 +5,12 @@
 #include <WindowServer/WindowServerEndpoint.h>
 
 class GWindowServerConnection
-    : public IPC::Client::ConnectionNG<WindowClientEndpoint, WindowServerEndpoint>
+    : public IServerConnection<WindowClientEndpoint, WindowServerEndpoint>
     , public WindowClientEndpoint {
     C_OBJECT(GWindowServerConnection)
 public:
     GWindowServerConnection()
-        : ConnectionNG(*this, "/tmp/portal/window")
+        : IServerConnection(*this, "/tmp/portal/window")
     {
         handshake();
     }

Libraries/LibIPC/IClientConnection.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <AK/Queue.h>
 #include <LibCore/CEvent.h>
 #include <LibCore/CEventLoop.h>
 #include <LibCore/CIODevice.h>
@@ -10,55 +9,48 @@
 #include <LibIPC/IEndpoint.h>
 #include <LibIPC/IMessage.h>
 #include <errno.h>
-#include <sched.h>
 #include <stdio.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/uio.h>
 #include <unistd.h>
 
-//#define CIPC_DEBUG
+class IEvent : public CEvent {
-
+public:
-namespace IPC {
-namespace Server {
-
-    class Event : public CEvent {
-    public:
     enum Type {
         Invalid = 2000,
         Disconnected,
     };
-        Event() {}
+    IEvent() {}
-        explicit Event(Type type)
+    explicit IEvent(Type type)
         : CEvent(type)
     {
     }
-    };
+};
 
-    class DisconnectedEvent : public Event {
+class IDisconnectedEvent : public IEvent {
-    public:
+public:
-        explicit DisconnectedEvent(int client_id)
+    explicit IDisconnectedEvent(int client_id)
-            : Event(Disconnected)
+        : IEvent(Disconnected)
         , m_client_id(client_id)
     {
     }
 
     int client_id() const { return m_client_id; }
 
-    private:
+private:
     int m_client_id { 0 };
-    };
+};
 
-    template<typename T, class... Args>
+template<typename T, class... Args>
-    NonnullRefPtr<T> new_connection_ng_for_client(Args&&... args)
+NonnullRefPtr<T> new_client_connection(Args&&... args)
-    {
+{
     return T::construct(forward<Args>(args)...) /* arghs */;
-    }
+}
 
-    template<typename Endpoint>
+template<typename Endpoint>
-    class ConnectionNG : public CObject {
+class IClientConnection : public CObject {
-    public:
+public:
-        ConnectionNG(Endpoint& endpoint, CLocalSocket& socket, int client_id)
+    IClientConnection(Endpoint& endpoint, CLocalSocket& socket, int client_id)
         : m_endpoint(endpoint)
         , m_socket(socket)
         , m_client_id(client_id)
@@ -67,7 +59,7 @@ namespace Server {
         m_socket->on_ready_to_read = [this] { drain_messages_from_client(); };
     }
 
-        virtual ~ConnectionNG() override
+    virtual ~IClientConnection() override
     {
     }
 
@@ -103,7 +95,7 @@ namespace Server {
             ssize_t nread = recv(m_socket->fd(), buffer, sizeof(buffer), MSG_DONTWAIT);
             if (nread == 0 || (nread == -1 && errno == EAGAIN)) {
                 if (bytes.is_empty()) {
-                        CEventLoop::current().post_event(*this, make<DisconnectedEvent>(client_id()));
+                    CEventLoop::current().post_event(*this, make<IDisconnectedEvent>(client_id()));
                     return;
                 }
                 break;
@@ -148,11 +140,11 @@ namespace Server {
 
     virtual void die() = 0;
 
-    protected:
+protected:
     void event(CEvent& event) override
     {
-            if (event.type() == Event::Disconnected) {
+        if (event.type() == IEvent::Disconnected) {
-                int client_id = static_cast<const DisconnectedEvent&>(event).client_id();
+            int client_id = static_cast<const IDisconnectedEvent&>(event).client_id();
             dbgprintf("Connection: Client disconnected: %d\n", client_id);
             die();
             return;
@@ -161,12 +153,9 @@ namespace Server {
         CObject::event(event);
     }
 
-    private:
+private:
     Endpoint& m_endpoint;
     RefPtr<CLocalSocket> m_socket;
     int m_client_id { -1 };
     int m_client_pid { -1 };
-    };
+};
-
-} // Server
-} // IPC

Libraries/LibIPC/IServerConnection.h

@@ -6,24 +6,17 @@
 #include <LibCore/CNotifier.h>
 #include <LibCore/CSyscallUtils.h>
 #include <LibIPC/IMessage.h>
-#include <sched.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <sys/uio.h>
 #include <unistd.h>
 
-//#define CIPC_DEBUG
+template<typename LocalEndpoint, typename PeerEndpoint>
-
+class IServerConnection : public CObject {
-namespace IPC {
+public:
-namespace Client {
+    IServerConnection(LocalEndpoint& local_endpoint, const StringView& address)
-
-    template<typename LocalEndpoint, typename PeerEndpoint>
-    class ConnectionNG : public CObject {
-    public:
-        ConnectionNG(LocalEndpoint& local_endpoint, const StringView& address)
         : m_local_endpoint(local_endpoint)
         , m_connection(CLocalSocket::construct(this))
         , m_notifier(CNotifier::construct(m_connection->fd(), CNotifier::Read, this))
@@ -111,7 +104,7 @@ namespace Client {
         return response;
     }
 
-    private:
+private:
     bool drain_messages_from_server()
     {
         Vector<u8> bytes;
@@ -155,7 +148,4 @@ namespace Client {
     Vector<OwnPtr<IMessage>> m_unprocessed_messages;
     int m_server_pid { -1 };
     int m_my_client_id { -1 };
-    };
+};
-
-} // Client
-} // IPC

Libraries/LibProtocol/Client.cpp

@@ -5,7 +5,7 @@
 namespace LibProtocol {
 
 Client::Client()
-    : ConnectionNG(*this, "/tmp/portal/protocol")
+    : IServerConnection(*this, "/tmp/portal/protocol")
 {
     handshake();
 }

Libraries/LibProtocol/Client.h

@@ -8,7 +8,7 @@ namespace LibProtocol {
 
 class Download;
 
-class Client : public IPC::Client::ConnectionNG<ProtocolClientEndpoint, ProtocolServerEndpoint>
+class Client : public IServerConnection<ProtocolClientEndpoint, ProtocolServerEndpoint>
     , public ProtocolClientEndpoint {
     C_OBJECT(Client)
 public:

Servers/AudioServer/ASClientConnection.cpp

@@ -23,7 +23,7 @@ void ASClientConnection::for_each(Function<void(ASClientConnection&)> callback)
 }
 
 ASClientConnection::ASClientConnection(CLocalSocket& client_socket, int client_id, ASMixer& mixer)
-    : ConnectionNG(*this, client_socket, client_id)
+    : IClientConnection(*this, client_socket, client_id)
     , m_mixer(mixer)
 {
     s_connections.set(client_id, *this);

Servers/AudioServer/ASClientConnection.h

@@ -7,7 +7,7 @@ class ABuffer;
 class ASBufferQueue;
 class ASMixer;
 
-class ASClientConnection final : public IPC::Server::ConnectionNG<AudioServerEndpoint>
+class ASClientConnection final : public IClientConnection<AudioServerEndpoint>
     , public AudioServerEndpoint {
     C_OBJECT(ASClientConnection)
 public:

Servers/AudioServer/ASEventLoop.cpp

@@ -17,6 +17,6 @@ ASEventLoop::ASEventLoop()
         }
         static int s_next_client_id = 0;
         int client_id = ++s_next_client_id;
-        IPC::Server::new_connection_ng_for_client<ASClientConnection>(*client_socket, client_id, m_mixer);
+        new_client_connection<ASClientConnection>(*client_socket, client_id, m_mixer);
     };
 }

Servers/ProtocolServer/PSClientConnection.cpp

@@ -7,7 +7,7 @@
 static HashMap<int, RefPtr<PSClientConnection>> s_connections;
 
 PSClientConnection::PSClientConnection(CLocalSocket& socket, int client_id)
-    : ConnectionNG(*this, socket, client_id)
+    : IClientConnection(*this, socket, client_id)
 {
     s_connections.set(client_id, *this);
 }

Servers/ProtocolServer/PSClientConnection.h

@@ -7,7 +7,7 @@
 class Download;
 class SharedBuffer;
 
-class PSClientConnection final : public IPC::Server::ConnectionNG<ProtocolServerEndpoint>
+class PSClientConnection final : public IClientConnection<ProtocolServerEndpoint>
     , public ProtocolServerEndpoint {
     C_OBJECT(PSClientConnection)
 public:

Servers/ProtocolServer/main.cpp

@@ -19,7 +19,7 @@ int main(int, char**)
         }
         static int s_next_client_id = 0;
         int client_id = ++s_next_client_id;
-        IPC::Server::new_connection_ng_for_client<PSClientConnection>(*client_socket, client_id);
+        new_client_connection<PSClientConnection>(*client_socket, client_id);
     };
     return event_loop.exec();
 }

Servers/WindowServer/WSClientConnection.cpp

@@ -42,7 +42,7 @@ WSClientConnection* WSClientConnection::from_client_id(int client_id)
 }
 
 WSClientConnection::WSClientConnection(CLocalSocket& client_socket, int client_id)
-    : ConnectionNG(*this, client_socket, client_id)
+    : IClientConnection(*this, client_socket, client_id)
 {
     if (!s_connections)
         s_connections = new HashMap<int, NonnullRefPtr<WSClientConnection>>;

Servers/WindowServer/WSClientConnection.h

@@ -15,7 +15,7 @@ class WSMenu;
 class WSMenuBar;
 
 class WSClientConnection final
-    : public IPC::Server::ConnectionNG<WindowServerEndpoint>
+    : public IClientConnection<WindowServerEndpoint>
     , public WindowServerEndpoint {
     C_OBJECT(WSClientConnection)
 public:

Servers/WindowServer/WSEventLoop.cpp

@@ -37,7 +37,7 @@ WSEventLoop::WSEventLoop()
         }
         static int s_next_client_id = 0;
         int client_id = ++s_next_client_id;
-        IPC::Server::new_connection_ng_for_client<WSClientConnection>(*client_socket, client_id);
+        new_client_connection<WSClientConnection>(*client_socket, client_id);
     };
 
     ASSERT(m_keyboard_fd >= 0);