From 901f0109132d99f10a73b2c03e3201b00e11d96f Mon Sep 17 00:00:00 2001
From: GasInfinity <me@gasinfinity.dev>
Date: Sat, 28 Mar 2026 17:32:29 +0100
Subject: [PATCH] fix: properly handle getaddrinfo/getnameinfo return values in
 `soc:U`

---
 src/core/hle/service/soc/soc_u.cpp | 33 ++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/core/hle/service/soc/soc_u.cpp b/src/core/hle/service/soc/soc_u.cpp
index 61cc88a39..ecce206c7 100644
--- a/src/core/hle/service/soc/soc_u.cpp
+++ b/src/core/hle/service/soc/soc_u.cpp
@@ -262,6 +262,14 @@ static const std::unordered_map<int, int> error_map = {{
     {ERRNO(ETIMEDOUT), 76},
 }};
 
+static const std::unordered_map<int, int> gai_error_map = {{
+    {EAI_AGAIN, 302},
+    {EAI_FAMILY, 303},
+    {EAI_MEMORY, 304},
+    {EAI_NONAME, 305},
+    {EAI_SOCKTYPE, 307},
+}};
+
 /// Converts a network error from platform-specific to 3ds-specific
 static int TranslateError(int error) {
     const auto& found = error_map.find(error);
@@ -271,6 +279,15 @@ static int TranslateError(int error) {
     return error;
 }
 
+/// Converts a getaddrinfo/getnameinfo error from platform-specific to 3ds-specific
+static int TranslateGaiError(int gai_error) {
+    if (const auto& known_soc_errno = gai_error_map.find(gai_error);
+        known_soc_errno != gai_error_map.end()) {
+        return -known_soc_errno->second;
+    }
+    return gai_error;
+}
+
 struct CTRLinger {
     u32_le l_onoff;
     u32_le l_linger;
@@ -2050,8 +2067,12 @@ void SOC_U::GetAddrInfoImpl(Kernel::HLERequestContext& ctx) {
     std::vector<u8> out_buff(out_size);
     u32 count = 0;
 
-    if (ret == SOCKET_ERROR_VALUE) {
-        ret = TranslateError(GET_ERRNO);
+    if (ret != 0) {
+#ifdef _WIN32
+        ret = TranslateGaiError(ret);
+#else
+        ret = ret == EAI_SYSTEM ? TranslateError(GET_ERRNO) : TranslateGaiError(ret);
+#endif
         out_buff.resize(0);
     } else {
         std::size_t pos = 0;
@@ -2097,8 +2118,12 @@ void SOC_U::GetNameInfoImpl(Kernel::HLERequestContext& ctx) {
 
     s32 ret = getnameinfo(reinterpret_cast<sockaddr*>(&sa), sa_len, host_data, hostlen, serv_data,
                           servlen, flags);
-    if (ret == SOCKET_ERROR_VALUE) {
-        ret = TranslateError(GET_ERRNO);
+    if (ret != 0) {
+#ifdef _WIN32
+        ret = TranslateGaiError(ret);
+#else
+        ret = ret == EAI_SYSTEM ? TranslateError(GET_ERRNO) : TranslateGaiError(ret);
+#endif
     }
 
     IPC::RequestBuilder rb = rp.MakeBuilder(2, 4);