Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[sockets] block more domains (#2632)

Calchanf4f3425d86c7
diff --git a/src/core/hle/service/sockets/sfdnsres.cpp b/src/core/hle/service/sockets/sfdnsres.cpp
index b07bd3e58e..68d73f0a59 100644
--- a/src/core/hle/service/sockets/sfdnsres.cpp
+++ b/src/core/hle/service/sockets/sfdnsres.cpp
@@ -53,6 +53,19 @@ enum class NetDbError : s32 {
NoData = 4,
};
+static const constexpr std::array blockedDomains = {"srv.nintendo.net",
+ "battle.net",
+ "microsoft.com",
+ "mojang.com",
+ "xboxlive.com",
+ "minecraftservices.com"};
+
+static bool IsBlockedHost(const std::string& host) {
+ return std::any_of(
+ blockedDomains.begin(), blockedDomains.end(),
+ [&host](const std::string& domain) { return host.find(domain) != std::string::npos; });
+}
+
static NetDbError GetAddrInfoErrorToNetDbError(GetAddrInfoError result) {
// These combinations have been verified on console (but are not
// exhaustive).
@@ -154,7 +167,7 @@ static std::pair<u32, GetAddrInfoError> GetHostByNameRequestImpl(HLERequestConte
// For now, ignore options, which are in input buffer 1 for GetHostByNameRequestWithOptions.
// Prevent resolution of Nintendo servers
- if (host.find("srv.nintendo.net") != std::string::npos) {
+ if (IsBlockedHost(host)) {
LOG_WARNING(Network, "Resolution of hostname {} requested, returning EAI_AGAIN", host);
return {0, GetAddrInfoError::AGAIN};
}
@@ -271,7 +284,7 @@ static std::pair<u32, GetAddrInfoError> GetAddrInfoRequestImpl(HLERequestContext
const std::string host = Common::StringFromBuffer(host_buffer);
// Prevent resolution of Nintendo servers
- if (host.find("srv.nintendo.net") != std::string::npos) {
+ if (IsBlockedHost(host)) {
LOG_WARNING(Network, "Resolution of hostname {} requested, returning EAI_AGAIN", host);
return {0, GetAddrInfoError::AGAIN};
}
@@ -359,5 +372,4 @@ void SFDNSRES::ResolverSetOptionRequest(HLERequestContext& ctx) {
rb.Push(ResultSuccess);
rb.Push<s32>(0); // bsd errno
}
-
} // namespace Service::Sockets