From bd750f010d7f60adbb5c91a863687f1e324d254a Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Sat, 19 Aug 2023 16:35:37 +0300 Subject: [PATCH 1/3] AC::CloseAsync --- include/services/ac.hpp | 1 + src/core/services/ac.cpp | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/include/services/ac.hpp b/include/services/ac.hpp index e05f7804..058df381 100644 --- a/include/services/ac.hpp +++ b/include/services/ac.hpp @@ -12,6 +12,7 @@ class ACService { // Service commands void cancelConnectAsync(u32 messagePointer); + void closeAsync(u32 messagePointer); void createDefaultConfig(u32 messagePointer); void getLastErrorCode(u32 messagePointer); void setClientVersion(u32 messagePointer); diff --git a/src/core/services/ac.cpp b/src/core/services/ac.cpp index 6bbeba0e..3298ff93 100644 --- a/src/core/services/ac.cpp +++ b/src/core/services/ac.cpp @@ -5,6 +5,7 @@ namespace ACCommands { enum : u32 { CreateDefaultConfig = 0x00010000, CancelConnectAsync = 0x00070002, + CloseAsync = 0x00080004, GetLastErrorCode = 0x000A0000, SetClientVersion = 0x00400042, }; @@ -15,6 +16,7 @@ void ACService::reset() {} void ACService::handleSyncRequest(u32 messagePointer) { const u32 command = mem.read32(messagePointer); switch (command) { + case ACCommands::CloseAsync: closeAsync(messagePointer); break; case ACCommands::CancelConnectAsync: cancelConnectAsync(messagePointer); break; case ACCommands::CreateDefaultConfig: createDefaultConfig(messagePointer); break; case ACCommands::GetLastErrorCode: getLastErrorCode(messagePointer); break; @@ -31,6 +33,14 @@ void ACService::cancelConnectAsync(u32 messagePointer) { mem.write32(messagePointer + 4, Result::Success); } +void ACService::closeAsync(u32 messagePointer) { + log("AC::CloseAsync (stubbed)\n"); + + // TODO: Verify if this response header is correct on hardware + mem.write32(messagePointer, IPC::responseHeader(0x8, 1, 0)); + mem.write32(messagePointer + 4, Result::Success); +} + void ACService::createDefaultConfig(u32 messagePointer) { log("AC::CreateDefaultConfig (stubbed)\n"); From 3f61283251e3b23381188dffc04433163c04151d Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Sat, 19 Aug 2023 17:12:58 +0300 Subject: [PATCH 2/3] Implement FRD::Logout and FRD::HasLoggedIn --- include/services/frd.hpp | 4 ++++ src/core/services/frd.cpp | 22 +++++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/include/services/frd.hpp b/include/services/frd.hpp index c37ab01e..17e50bc4 100644 --- a/include/services/frd.hpp +++ b/include/services/frd.hpp @@ -19,6 +19,8 @@ class FRDService { Memory& mem; MAKE_LOG_FUNCTION(log, frdLogger) + bool loggedIn = false; + // Service commands void attachToEventNotification(u32 messagePointer); void getFriendKeyList(u32 messagePointer); @@ -27,6 +29,8 @@ class FRDService { void getMyPresence(u32 messagePointer); void getMyProfile(u32 messagePointer); void getMyScreenName(u32 messsagePointer); + void hasLoggedIn(u32 messagePointer); + void logout(u32 messagePointer); void setClientSDKVersion(u32 messagePointer); void setNotificationMask(u32 messagePointer); void updateGameModeDescription(u32 messagePointer); diff --git a/src/core/services/frd.cpp b/src/core/services/frd.cpp index 028224a5..67683dc1 100644 --- a/src/core/services/frd.cpp +++ b/src/core/services/frd.cpp @@ -7,9 +7,11 @@ namespace FRDCommands { enum : u32 { + HasLoggedIn = 0x00010000, AttachToEventNotification = 0x00200002, SetNotificationMask = 0x00210040, SetClientSdkVersion = 0x00320042, + Logout = 0x00040000, GetMyFriendKey = 0x00050000, GetMyProfile = 0x00070000, GetMyPresence = 0x00080000, @@ -20,7 +22,7 @@ namespace FRDCommands { }; } -void FRDService::reset() {} +void FRDService::reset() { loggedIn = false; } void FRDService::handleSyncRequest(u32 messagePointer) { const u32 command = mem.read32(messagePointer); @@ -32,6 +34,8 @@ void FRDService::handleSyncRequest(u32 messagePointer) { case FRDCommands::GetMyPresence: getMyPresence(messagePointer); break; case FRDCommands::GetMyProfile: getMyProfile(messagePointer); break; case FRDCommands::GetMyScreenName: getMyScreenName(messagePointer); break; + case FRDCommands::HasLoggedIn: hasLoggedIn(messagePointer); break; + case FRDCommands::Logout: logout(messagePointer); break; case FRDCommands::SetClientSdkVersion: setClientSDKVersion(messagePointer); break; case FRDCommands::SetNotificationMask: setNotificationMask(messagePointer); break; case FRDCommands::UpdateGameModeDescription: updateGameModeDescription(messagePointer); break; @@ -146,4 +150,20 @@ void FRDService::getMyMii(u32 messagePointer) { // TODO: How is the mii data even returned? mem.write32(messagePointer, IPC::responseHeader(0xA, 2, 0)); mem.write32(messagePointer + 4, Result::Success); +} + +void FRDService::hasLoggedIn(u32 messagePointer) { + log("FRD::HasLoggedIn\n"); + + mem.write32(messagePointer, IPC::responseHeader(0x1, 2, 0)); + mem.write32(messagePointer + 4, Result::Success); + mem.write8(messagePointer + 8, loggedIn ? 1 : 0); +} + +void FRDService::logout(u32 messagePointer) { + log("FRD::Logout\n"); + loggedIn = false; + + mem.write32(messagePointer, IPC::responseHeader(0x4, 1, 0)); + mem.write32(messagePointer + 4, Result::Success); } \ No newline at end of file From a13792996c114327570158faf3db7be00a608863 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Sat, 19 Aug 2023 17:17:00 +0300 Subject: [PATCH 3/3] Formatting --- src/core/services/ac.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/services/ac.cpp b/src/core/services/ac.cpp index 3298ff93..480cef93 100644 --- a/src/core/services/ac.cpp +++ b/src/core/services/ac.cpp @@ -16,8 +16,8 @@ void ACService::reset() {} void ACService::handleSyncRequest(u32 messagePointer) { const u32 command = mem.read32(messagePointer); switch (command) { - case ACCommands::CloseAsync: closeAsync(messagePointer); break; case ACCommands::CancelConnectAsync: cancelConnectAsync(messagePointer); break; + case ACCommands::CloseAsync: closeAsync(messagePointer); break; case ACCommands::CreateDefaultConfig: createDefaultConfig(messagePointer); break; case ACCommands::GetLastErrorCode: getLastErrorCode(messagePointer); break; case ACCommands::SetClientVersion: setClientVersion(messagePointer); break;