Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1924682 - Fix tier 3 builds by ifdefing nsINetworkLinkService::HasNonLocalIPv6Address r=necko-reviewers,kershaw

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D226114
This commit is contained in:
Valentin Gosu 2024-10-18 16:28:30 +00:00
parent cee996539e
commit 78b9a3a57c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netwerk/dns/GetAddrInfo.cpp
View File

@ -201,6 +201,15 @@ _DNSQuery_A_SingleLabel(const nsACString& aCanonHost, uint16_t aAddressFamily,
// PORTABLE RUNTIME IMPLEMENTATION//
////////////////////////////////////
static bool SkipIPv6DNSLookup() {
#if defined(XP_WIN) || defined(XP_LINUX) || defined(XP_MACOSX)
return StaticPrefs::network_dns_skip_ipv6_when_no_addresses() &&
!nsINetworkLinkService::HasNonLocalIPv6Address();
#else
return false;
#endif
}
static MOZ_ALWAYS_INLINE nsresult
_GetAddrInfo_Portable(const nsACString& aCanonHost, uint16_t aAddressFamily,
nsIDNSService::DNSFlags aFlags, AddrInfo** aAddrInfo) {
@ -222,8 +231,7 @@ _GetAddrInfo_Portable(const nsACString& aCanonHost, uint16_t aAddressFamily,
aAddressFamily = PR_AF_UNSPEC;
}
if (StaticPrefs::network_dns_skip_ipv6_when_no_addresses() &&
!nsINetworkLinkService::HasNonLocalIPv6Address()) {
if (SkipIPv6DNSLookup()) {
// If the family was AF_UNSPEC initially, make it AF_INET
// when there are no IPv6 addresses.
// If the DNS request specified IPv6 specifically, let it