diff options
| author | Subv <subv2112@gmail.com> | 2016-12-05 13:59:57 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2016-12-05 13:59:57 -0500 |
| commit | c93c5a72bb46796e898f54a7c13dfb8d941ddd4d (patch) | |
| tree | 1e5bded69840948daaa8b27bcba05a14b38dcb75 /src/core/hle/kernel/client_port.cpp | |
| parent | 61a2fe8c3bcd5e6dc7e97945b923d1a5bd8099ec (diff) | |
Return an error code when connecting to a saturated port.
The error code was taken from the 3DS kernel.
Diffstat (limited to 'src/core/hle/kernel/client_port.cpp')
| -rw-r--r-- | src/core/hle/kernel/client_port.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp index b6a4cab26..120ce554d 100644 --- a/src/core/hle/kernel/client_port.cpp +++ b/src/core/hle/kernel/client_port.cpp @@ -14,7 +14,14 @@ namespace Kernel { ClientPort::ClientPort() {} ClientPort::~ClientPort() {} -SharedPtr<ClientSession> ClientPort::Connect() { +ResultVal<SharedPtr<ClientSession>> ClientPort::Connect() { + if (active_sessions >= max_sessions) { + 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); @@ -25,7 +32,7 @@ SharedPtr<ClientSession> ClientPort::Connect() { // Wake the threads waiting on the ServerPort server_port->WakeupAllWaitingThreads(); - return std::move(client_session); + return MakeResult<SharedPtr<ClientSession>>(std::move(client_session)); } } // namespace |
