ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8726 from xperia64/dns_improvements 

Respect Core::WantsDeterminism for DNS servers on Linux
This commit is contained in:
Léo Lam 2020-04-27 16:43:24 +02:00 committed by GitHub
parent 9d44af4c31 b4e49dc656
commit 71f409dac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/IOS/Network/IP/Top.cpp
View File

@ -860,10 +860,13 @@ IPCCommandResult NetIPTop::HandleGetInterfaceOptRequest(const IOCtlVRequest& req
} }
} }
#elif defined(__linux__) && !defined(__ANDROID__) #elif defined(__linux__) && !defined(__ANDROID__)
if (res_init() == 0) if (!Core::WantsDeterminism())
address = ntohl(_res.nsaddr_list[0].sin_addr.s_addr); {
else if (res_init() == 0)
WARN_LOG(IOS_NET, "Call to res_init failed"); address = ntohl(_res.nsaddr_list[0].sin_addr.s_addr);
else
WARN_LOG(IOS_NET, "Call to res_init failed");
}
#endif #endif
if (address == 0) if (address == 0)
address = default_main_dns_resolver; address = default_main_dns_resolver;