Merge pull request #2249 from Subv/sessions_v3

Kernel/IPC: Use Ports and Sessions as the fundamental building block of Inter Process Communication.

1 files changed, 32 insertions, 0 deletions

diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp
index aedc6f989..22645f4ec 100644
--- a/src/core/hle/kernel/client_port.cpp
+++ b/src/core/hle/kernel/client_port.cpp
@@ -4,12 +4,44 @@
 
 #include "common/assert.h"
 #include "core/hle/kernel/client_port.h"
+#include "core/hle/kernel/client_session.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/server_port.h"
+#include "core/hle/kernel/server_session.h"
 
 namespace Kernel {
 
 ClientPort::ClientPort() {}
 ClientPort::~ClientPort() {}
 
+ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() {
+    // Note: Threads do not wait for the server endpoint to call
+    // AcceptSession before returning from this call.
+
+    if (active_sessions >= max_sessions) {
+        // TODO(Subv): Return an error code in this situation after session disconnection is
+        // implemented.
+        /*return ResultCode(ErrorDescription::MaxConnectionsReached,
+                          ErrorModule::OS, ErrorSummary::WouldBlock,
+                          ErrorLevel::Temporary);*/
+    }
+    active_sessions++;
+
+    // Create a new session pair, let the created sessions inherit the parent port's HLE handler.
+    auto sessions =
+        ServerSession::CreateSessionPair(server_port->GetName(), server_port->hle_handler);
+    auto client_session = std::get<SharedPtr<ClientSession>>(sessions);
+    auto server_session = std::get<SharedPtr<ServerSession>>(sessions);
+
+    if (server_port->hle_handler)
+        server_port->hle_handler->ClientConnected(server_session);
+
+    server_port->pending_sessions.push_back(std::move(server_session));
+
+    // Wake the threads waiting on the ServerPort
+    server_port->WakeupAllWaitingThreads();
+
+    return MakeResult<SharedPtr<ClientSession>>(std::move(client_session));
+}
+
 } // namespace