diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-06 08:31:59 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-06-06 11:57:04 +0200 |
commit | 23ec6b3d8f33e2e0d76e646049f1fc1d36e70cf3 (patch) | |
tree | b6672a86793b53fdf3e07340515d731e45253677 /src/core/hle/service/sm/srv.cpp | |
parent | Service/sm: Use an actual semaphore for the notification semaphore (diff) | |
download | yuzu-23ec6b3d8f33e2e0d76e646049f1fc1d36e70cf3.tar yuzu-23ec6b3d8f33e2e0d76e646049f1fc1d36e70cf3.tar.gz yuzu-23ec6b3d8f33e2e0d76e646049f1fc1d36e70cf3.tar.bz2 yuzu-23ec6b3d8f33e2e0d76e646049f1fc1d36e70cf3.tar.lz yuzu-23ec6b3d8f33e2e0d76e646049f1fc1d36e70cf3.tar.xz yuzu-23ec6b3d8f33e2e0d76e646049f1fc1d36e70cf3.tar.zst yuzu-23ec6b3d8f33e2e0d76e646049f1fc1d36e70cf3.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/sm/srv.cpp | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/src/core/hle/service/sm/srv.cpp b/src/core/hle/service/sm/srv.cpp index d6946c734..34166289c 100644 --- a/src/core/hle/service/sm/srv.cpp +++ b/src/core/hle/service/sm/srv.cpp @@ -9,6 +9,7 @@ #include "core/hle/kernel/client_session.h" #include "core/hle/kernel/semaphore.h" #include "core/hle/kernel/server_session.h" +#include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/srv.h" namespace Service { @@ -78,25 +79,41 @@ static void GetServiceHandle(Interface* self) { ResultCode res = RESULT_SUCCESS; u32* cmd_buff = Kernel::GetCommandBuffer(); - std::string port_name = std::string((const char*)&cmd_buff[1], 0, Service::kMaxPortSize); - auto it = Service::g_srv_services.find(port_name); + size_t name_len = cmd_buff[3]; + if (name_len > Service::kMaxPortSize) { + cmd_buff[1] = ERR_INVALID_NAME_SIZE.raw; + LOG_ERROR(Service_SRV, "called name_len=0x%X, failed with code=0x%08X", name_len, + cmd_buff[1]); + return; + } + std::string name(reinterpret_cast<const char*>(&cmd_buff[1]), name_len); + bool return_port_on_failure = (cmd_buff[4] & 1) == 0; - if (it != Service::g_srv_services.end()) { - auto client_port = it->second; + // TODO(yuriks): Permission checks go here - auto client_session = client_port->Connect(); - res = client_session.Code(); + auto client_port = g_service_manager->GetServicePort(name); + if (client_port.Failed()) { + cmd_buff[1] = client_port.Code().raw; + LOG_ERROR(Service_SRV, "called service=%s, failed with code=0x%08X", name.c_str(), + cmd_buff[1]); + return; + } - if (client_session.Succeeded()) { - // Return the client session - cmd_buff[3] = Kernel::g_handle_table.Create(*client_session).MoveFrom(); - } - LOG_TRACE(Service_SRV, "called port=%s, handle=0x%08X", port_name.c_str(), cmd_buff[3]); + auto session = client_port.Unwrap()->Connect(); + cmd_buff[1] = session.Code().raw; + if (session.Succeeded()) { + cmd_buff[3] = Kernel::g_handle_table.Create(session.MoveFrom()).MoveFrom(); + LOG_DEBUG(Service_SRV, "called service=%s, session handle=0x%08X", name.c_str(), + cmd_buff[3]); + } else if (session.Code() == Kernel::ERR_MAX_CONNECTIONS_REACHED && return_port_on_failure) { + cmd_buff[1] = ERR_MAX_CONNECTIONS_REACHED.raw; + cmd_buff[3] = Kernel::g_handle_table.Create(client_port.MoveFrom()).MoveFrom(); + LOG_WARNING(Service_SRV, "called service=%s, *port* handle=0x%08X", name.c_str(), + cmd_buff[3]); } else { - LOG_ERROR(Service_SRV, "(UNIMPLEMENTED) called port=%s", port_name.c_str()); - res = UnimplementedFunction(ErrorModule::SRV); + LOG_ERROR(Service_SRV, "called service=%s, failed with code=0x%08X", name.c_str(), + cmd_buff[1]); } - cmd_buff[1] = res.raw; } /** |