2026-09-26 11:36:51

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/core/hle/service/ldn/ldn.cpp

@@ -21,7 +21,7 @@ class IClientProcessMonitor final
 public:
     explicit IClientProcessMonitor(Core::System& system_) : ServiceFramework{system_, "IClientProcessMonitor"} {}
 
-    FunctionInfoBase const* FindRequest(u32 key) override {
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
         return HandlerTableGenerateWithFind(key, functions);
     }
     ~IClientProcessMonitor() override = default;
@@ -40,7 +40,7 @@ class IMonitorServiceCreator final : public ServiceFramework<IMonitorServiceCrea
 public:
     explicit IMonitorServiceCreator(Core::System& system_) : ServiceFramework{system_, "ldn:m"} {}
 
-    FunctionInfoBase const* FindRequest(u32 key) override {
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
         return HandlerTableGenerateWithFind(key, functions);
     }
 private:
@@ -60,7 +60,7 @@ class ISystemServiceCreator final : public ServiceFramework<ISystemServiceCreato
 public:
     explicit ISystemServiceCreator(Core::System& system_) : ServiceFramework{system_, "ldn:s"} {}
 
-    FunctionInfoBase const* FindRequest(u32 key) override {
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
         return HandlerTableGenerateWithFind(key, functions);
     }
 private:
@@ -90,7 +90,7 @@ class IUserServiceCreator final : public ServiceFramework<IUserServiceCreator> {
 public:
     explicit IUserServiceCreator(Core::System& system_) : ServiceFramework{system_, "ldn:u"} {}
 
-    FunctionInfoBase const* FindRequest(u32 key) override {
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
         return HandlerTableGenerateWithFind(key, functions);
     }
 private:
@@ -120,7 +120,7 @@ class ISfServiceCreator final : public ServiceFramework<ISfServiceCreator> {
 public:
     explicit ISfServiceCreator(Core::System& system_, bool is_system_, const char* name_) : ServiceFramework{system_, name_}, is_system{is_system_} {}
 
-    FunctionInfoBase const* FindRequest(u32 key) override {
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
         return HandlerTableGenerateWithFind(key, functions);
     }
 private:
@@ -152,7 +152,7 @@ class ISfMonitorServiceCreator final : public ServiceFramework<ISfMonitorService
 public:
     explicit ISfMonitorServiceCreator(Core::System& system_) : ServiceFramework{system_, "lp2p:m"} {}
 
-    FunctionInfoBase const* FindRequest(u32 key) override {
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
         return HandlerTableGenerateWithFind(key, functions);
     }
 private:

src/core/hle/service/ldn/monitor_service.cpp

@@ -10,7 +10,7 @@
 
 namespace Service::LDN {
 
-ServiceFrameworkBase::FunctionInfoBase const* IMonitorService::FindRequest(u32 key) {
+std::optional<ServiceFrameworkBase::FunctionInfoBase> IMonitorService::FindRequest(u32 key) {
     static constexpr auto functions = CreateStaticMap(
         FunctionInfo{0, C<&IMonitorService::GetStateForMonitor>, "GetStateForMonitor"},
         FunctionInfo{1, nullptr, "GetNetworkInfoForMonitor"},

src/core/hle/service/ldn/monitor_service.h

@@ -26,7 +26,7 @@ private:
     Result InitializeMonitor();
     Result FinalizeMonitor();
 
-    FunctionInfoBase const* FindRequest(u32 key) override;
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override;
     State state{State::None};
 };
 

src/core/hle/service/ldn/sf_monitor_service.cpp

@@ -10,7 +10,7 @@
 
 namespace Service::LDN {
 
-ServiceFrameworkBase::FunctionInfoBase const* ISfMonitorService::FindRequest(u32 key) {
+std::optional<ServiceFrameworkBase::FunctionInfoBase> ISfMonitorService::FindRequest(u32 key) {
     static constexpr auto functions = CreateStaticMap(
         FunctionInfo{0, C<&ISfMonitorService::Initialize>, "Initialize"},
         FunctionInfo{288, C<&ISfMonitorService::GetGroupInfo>, "GetGroupInfo"},

src/core/hle/service/ldn/sf_monitor_service.h

@@ -24,7 +24,7 @@ public:
 private:
     Result Initialize(Out<u32> out_value);
     Result GetGroupInfo(OutLargeData<GroupInfo, BufferAttr_HipcAutoSelect> out_group_info);
-    FunctionInfoBase const* FindRequest(u32 key) override;
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override;
 };
 
 } // namespace Service::LDN

src/core/hle/service/ldn/sf_service.h

@@ -20,7 +20,7 @@ public:
     explicit ISfService(Core::System& system_);
     ~ISfService() override;
 
-    FunctionInfoBase const* FindRequest(u32 key) override {
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override {
         return HandlerTableGenerateWithFind(key, functions);
     }
     static constexpr auto functions = CreateStaticMap(

src/core/hle/service/ldn/sf_service_monitor.cpp

@@ -10,7 +10,7 @@
 
 namespace Service::LDN {
 
-ServiceFrameworkBase::FunctionInfoBase const* ISfServiceMonitor::FindRequest(u32 key) {
+std::optional<ServiceFrameworkBase::FunctionInfoBase> ISfServiceMonitor::FindRequest(u32 key) {
     static constexpr auto functions = CreateStaticMap(
         FunctionInfo{0, C<&ISfServiceMonitor::Initialize>, "Initialize"},
         FunctionInfo{256, nullptr, "AttachNetworkInterfaceStateChangeEvent"},

src/core/hle/service/ldn/sf_service_monitor.h

@@ -24,7 +24,7 @@ public:
 private:
     Result Initialize(Out<u32> out_value);
     Result GetGroupInfo(OutLargeData<GroupInfo, BufferAttr_HipcAutoSelect> out_group_info, GroupInfo in_group_info);
-    FunctionInfoBase const* FindRequest(u32 key) override;
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override;
 };
 
 } // namespace Service::LDN

src/core/hle/service/ldn/system_local_communication_service.cpp

@@ -9,7 +9,7 @@
 
 namespace Service::LDN {
 
-ServiceFrameworkBase::FunctionInfoBase const* ISystemLocalCommunicationService::FindRequest(u32 key) {
+std::optional<ServiceFrameworkBase::FunctionInfoBase> ISystemLocalCommunicationService::FindRequest(u32 key) {
     static constexpr auto functions = CreateStaticMap(
         FunctionInfo{0, nullptr, "GetState"},
         FunctionInfo{1, nullptr, "GetNetworkInfo"},

src/core/hle/service/ldn/system_local_communication_service.h

@@ -23,7 +23,7 @@ public:
 
 private:
     Result InitializeSystem2();
-    FunctionInfoBase const* FindRequest(u32 key) override;
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override;
 };
 
 } // namespace Service::LDN

src/core/hle/service/ldn/user_local_communication_service.cpp

@@ -21,7 +21,7 @@
 
 namespace Service::LDN {
 
-ServiceFrameworkBase::FunctionInfoBase const* IUserLocalCommunicationService::FindRequest(u32 key) {
+std::optional<ServiceFrameworkBase::FunctionInfoBase> IUserLocalCommunicationService::FindRequest(u32 key) {
     static constexpr auto functions = CreateStaticMap(
         FunctionInfo{0, D<&IUserLocalCommunicationService::GetState>, "GetState"},
         FunctionInfo{1, D<&IUserLocalCommunicationService::GetNetworkInfo>, "GetNetworkInfo"},

src/core/hle/service/ldn/user_local_communication_service.h

@@ -89,7 +89,7 @@ private:
     /// Callback to parse and handle a received LDN packet.
     void OnLDNPacketReceived(const Network::LDNPacket& packet);
     void OnEventFired();
-    FunctionInfoBase const* FindRequest(u32 key) override;
+    std::optional<FunctionInfoBase> FindRequest(u32 key) override;
 
     KernelHelpers::ServiceContext service_context;
     Kernel::KEvent* state_change_event;