summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2020-04-27 16:43:24 +0200
committerGitHub <noreply@github.com>2020-04-27 16:43:24 +0200
commit71f409dac49b3d9105e33f2bb7ea2ddea794e562 (patch)
treebc6e7be52b385427036e52d118887a136a46f2e1 /Source
parent9d44af4c3141c86a2c3ee9ab6ca849ee961a6fa4 (diff)
parentb4e49dc65697c99108ac61a7853a5f88732f41cc (diff)
Merge pull request #8726 from xperia64/dns_improvements
Respect Core::WantsDeterminism for DNS servers on Linux
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/IOS/Network/IP/Top.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/Core/Core/IOS/Network/IP/Top.cpp b/Source/Core/Core/IOS/Network/IP/Top.cpp
index 4aff46e48d..53adfce757 100644
--- a/Source/Core/Core/IOS/Network/IP/Top.cpp
+++ b/Source/Core/Core/IOS/Network/IP/Top.cpp
@@ -860,10 +860,13 @@ IPCCommandResult NetIPTop::HandleGetInterfaceOptRequest(const IOCtlVRequest& req
}
}
#elif defined(__linux__) && !defined(__ANDROID__)
- if (res_init() == 0)
- address = ntohl(_res.nsaddr_list[0].sin_addr.s_addr);
- else
- WARN_LOG(IOS_NET, "Call to res_init failed");
+ if (!Core::WantsDeterminism())
+ {
+ if (res_init() == 0)
+ address = ntohl(_res.nsaddr_list[0].sin_addr.s_addr);
+ else
+ WARN_LOG(IOS_NET, "Call to res_init failed");
+ }
#endif
if (address == 0)
address = default_main_dns_resolver;