Skip to content

Commit 694b771

Browse files
bogdant-oldbogdant-old
committed
Backed out 2 changesets (bug 1657582) for test_DNSLookup.js failures CLOSED TREE
Backed out changeset 784122a5f5ab (bug 1657582) Backed out changeset 0f17312b01ad (bug 1657582)
1 parent 98b30d2 commit 694b771

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+607
-536
lines changed

‎browser/base/content/browser.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1412,9 +1412,7 @@ var gKeywordURIFixup = {
14121412
try {
14131413
gDNSService.asyncResolve(
14141414
hostName,
1415-
Ci.nsIDNSService.RESOLVE_TYPE_DEFAULT,
14161415
0,
1417-
null,
14181416
onLookupCompleteListener,
14191417
Services.tm.mainThread,
14201418
contentPrincipal.originAttributes

‎browser/components/doh/DoHHeuristics.jsm

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ async function dnsLookup(hostname, resolveCanonicalName = false) {
106106
reject({ message: new Components.Exception("", inStatus).name });
107107
return;
108108
}
109-
inRecord.QueryInterface(Ci.nsIDNSAddrRecord);
110109
if (resolveCanonicalName) {
111110
try {
112111
response.canonicalName = inRecord.canonicalName;
@@ -133,9 +132,7 @@ async function dnsLookup(hostname, resolveCanonicalName = false) {
133132
try {
134133
request = gDNSService.asyncResolve(
135134
hostname,
136-
Ci.nsIDNSService.RESOLVE_TYPE_DEFAULT,
137135
dnsFlags,
138-
null,
139136
listener,
140137
null,
141138
{} /* defaultOriginAttributes */

‎browser/components/doh/TRRPerformance.jsm

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,10 @@ class DNSLookup {
116116
this.retryCount++;
117117
try {
118118
this.usedDomain = this._domain || getRandomSubdomain();
119-
gDNSService.asyncResolve(
119+
gDNSService.asyncResolveWithTrrServer(
120120
this.usedDomain,
121-
Ci.nsIDNSService.RESOLVE_TYPE_DEFAULT,
121+
this.trrServer,
122122
Ci.nsIDNSService.RESOLVE_BYPASS_CACHE,
123-
gDNSService.newTRRResolverInfo(this.trrServer),
124123
this,
125124
Services.tm.currentThread,
126125
{}
@@ -182,10 +181,7 @@ class LookupAggregator {
182181
domain: usedDomain,
183182
trr,
184183
status,
185-
time: record
186-
? record.QueryInterface(Ci.nsIDNSAddrRecord)
187-
.trrFetchDurationNetworkOnly
188-
: -1,
184+
time: record ? record.trrFetchDurationNetworkOnly : -1,
189185
retryCount,
190186
});
191187

‎dom/html/nsHTMLDNSPrefetch.cpp

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ nsresult nsHTMLDNSPrefetch::Prefetch(
154154

155155
nsCOMPtr<nsICancelable> tmpOutstanding;
156156
nsresult rv = sDNSService->AsyncResolveNative(
157-
NS_ConvertUTF16toUTF8(hostname), nsIDNSService::RESOLVE_TYPE_DEFAULT,
158-
flags | nsIDNSService::RESOLVE_SPECULATE, nullptr, sDNSListener, nullptr,
159-
aPartitionedPrincipalOriginAttributes, getter_AddRefs(tmpOutstanding));
157+
NS_ConvertUTF16toUTF8(hostname), flags | nsIDNSService::RESOLVE_SPECULATE,
158+
sDNSListener, nullptr, aPartitionedPrincipalOriginAttributes,
159+
getter_AddRefs(tmpOutstanding));
160160
if (NS_FAILED(rv)) {
161161
return rv;
162162
}
@@ -166,11 +166,10 @@ nsresult nsHTMLDNSPrefetch::Prefetch(
166166
nsAutoCString esniHost;
167167
esniHost.Append("_esni.");
168168
esniHost.Append(NS_ConvertUTF16toUTF8(hostname));
169-
Unused << sDNSService->AsyncResolveNative(
169+
Unused << sDNSService->AsyncResolveByTypeNative(
170170
esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
171-
flags | nsIDNSService::RESOLVE_SPECULATE, nullptr, sDNSListener,
172-
nullptr, aPartitionedPrincipalOriginAttributes,
173-
getter_AddRefs(tmpOutstanding));
171+
flags | nsIDNSService::RESOLVE_SPECULATE, sDNSListener, nullptr,
172+
aPartitionedPrincipalOriginAttributes, getter_AddRefs(tmpOutstanding));
174173
}
175174

176175
return NS_OK;
@@ -252,19 +251,17 @@ nsresult nsHTMLDNSPrefetch::CancelPrefetch(
252251

253252
// Forward cancellation to DNS service
254253
nsresult rv = sDNSService->CancelAsyncResolveNative(
255-
NS_ConvertUTF16toUTF8(hostname), nsIDNSService::RESOLVE_TYPE_DEFAULT,
256-
flags | nsIDNSService::RESOLVE_SPECULATE,
257-
nullptr, // resolverInfo
254+
NS_ConvertUTF16toUTF8(hostname), flags | nsIDNSService::RESOLVE_SPECULATE,
258255
sDNSListener, aReason, aPartitionedPrincipalOriginAttributes);
259256
// Cancel fetching ESNI keys if needed.
260257
if (StaticPrefs::network_security_esni_enabled() && isHttps) {
261258
nsAutoCString esniHost;
262259
esniHost.Append("_esni.");
263260
esniHost.Append(NS_ConvertUTF16toUTF8(hostname));
264-
sDNSService->CancelAsyncResolveNative(
261+
sDNSService->CancelAsyncResolveByTypeNative(
265262
esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
266-
flags | nsIDNSService::RESOLVE_SPECULATE, nullptr, sDNSListener,
267-
aReason, aPartitionedPrincipalOriginAttributes);
263+
flags | nsIDNSService::RESOLVE_SPECULATE, sDNSListener, aReason,
264+
aPartitionedPrincipalOriginAttributes);
268265
}
269266
return rv;
270267
}
@@ -406,21 +403,19 @@ void nsHTMLDNSPrefetch::nsDeferrals::SubmitQueue() {
406403
nsCOMPtr<nsICancelable> tmpOutstanding;
407404

408405
rv = sDNSService->AsyncResolveNative(
409-
hostName, nsIDNSService::RESOLVE_TYPE_DEFAULT,
406+
hostName,
410407
mEntries[mTail].mFlags | nsIDNSService::RESOLVE_SPECULATE,
411-
nullptr, sDNSListener, nullptr, oa,
412-
getter_AddRefs(tmpOutstanding));
408+
sDNSListener, nullptr, oa, getter_AddRefs(tmpOutstanding));
413409
// Fetch ESNI keys if needed.
414410
if (NS_SUCCEEDED(rv) &&
415411
StaticPrefs::network_security_esni_enabled() && isHttps) {
416412
nsAutoCString esniHost;
417413
esniHost.Append("_esni.");
418414
esniHost.Append(hostName);
419-
sDNSService->AsyncResolveNative(
415+
sDNSService->AsyncResolveByTypeNative(
420416
esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
421417
mEntries[mTail].mFlags | nsIDNSService::RESOLVE_SPECULATE,
422-
nullptr, sDNSListener, nullptr, oa,
423-
getter_AddRefs(tmpOutstanding));
418+
sDNSListener, nullptr, oa, getter_AddRefs(tmpOutstanding));
424419
}
425420
// Tell link that deferred prefetch was requested
426421
if (NS_SUCCEEDED(rv)) link->OnDNSPrefetchRequested();

‎extensions/auth/nsAuthSSPI.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,9 @@ nsresult nsAuthSSPI::MakeSN(const char* principal, nsCString& result) {
120120
nsIDNSService::RESOLVE_CANONICAL_NAME, attrs,
121121
getter_AddRefs(record));
122122
if (NS_FAILED(rv)) return rv;
123-
nsCOMPtr<nsIDNSAddrRecord> rec = do_QueryInterface(record);
124-
if (!rec) {
125-
return NS_ERROR_UNEXPECTED;
126-
}
127123

128124
nsAutoCString cname;
129-
rv = rec->GetCanonicalName(cname);
125+
rv = record->GetCanonicalName(cname);
130126
if (NS_SUCCEEDED(rv)) {
131127
result = StringHead(buf, index) + "/"_ns + cname;
132128
LOG(("Using SPN of [%s]\n", result.get()));

‎media/mtransport/nriceresolver.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,9 @@ int NrIceResolver::resolve(nr_resolver_resource* resource,
171171
ABORT(R_BAD_ARGS);
172172
}
173173

174-
if (NS_FAILED(dns_->AsyncResolveNative(
175-
nsAutoCString(resource->domain_name),
176-
nsIDNSService::RESOLVE_TYPE_DEFAULT, resolve_flags, nullptr, pr,
177-
sts_thread_, attrs, getter_AddRefs(pr->request_)))) {
174+
if (NS_FAILED(dns_->AsyncResolveNative(nsAutoCString(resource->domain_name),
175+
resolve_flags, pr, sts_thread_, attrs,
176+
getter_AddRefs(pr->request_)))) {
178177
MOZ_MTLOG(ML_ERROR, "AsyncResolve failed.");
179178
ABORT(R_NOT_FOUND);
180179
}
@@ -192,7 +191,7 @@ int NrIceResolver::resolve(nr_resolver_resource* resource,
192191
}
193192

194193
nsresult NrIceResolver::PendingResolution::OnLookupComplete(
195-
nsICancelable* request, nsIDNSRecord* aRecord, nsresult status) {
194+
nsICancelable* request, nsIDNSRecord* record, nsresult status) {
196195
ASSERT_ON_THREAD(thread_);
197196
// First check if we've been canceled. This is single-threaded on the STS
198197
// thread, but cancel() cannot guarantee this event isn't on the queue.
@@ -202,8 +201,7 @@ nsresult NrIceResolver::PendingResolution::OnLookupComplete(
202201
// TODO([email protected]): Revisit when we do TURN.
203202
if (NS_SUCCEEDED(status)) {
204203
net::NetAddr na;
205-
nsCOMPtr<nsIDNSAddrRecord> record = do_QueryInterface(aRecord);
206-
if (record && NS_SUCCEEDED(record->GetNextAddr(port_, &na))) {
204+
if (NS_SUCCEEDED(record->GetNextAddr(port_, &na))) {
207205
MOZ_ALWAYS_TRUE(nr_netaddr_to_transport_addr(&na, &ta, transport_) ==
208206
0);
209207
cb_addr = &ta;

‎netwerk/base/Dashboard.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -276,21 +276,21 @@ nsresult LookupHelper::ConstructAnswer(LookupArgument* aArgument) {
276276
dict.mAddress.Construct();
277277

278278
Sequence<nsString>& addresses = dict.mAddress.Value();
279-
nsCOMPtr<nsIDNSAddrRecord> record = do_QueryInterface(aRecord);
280-
if (NS_SUCCEEDED(mStatus) && record) {
279+
280+
if (NS_SUCCEEDED(mStatus)) {
281281
dict.mAnswer = true;
282282
bool hasMore;
283-
record->HasMore(&hasMore);
283+
aRecord->HasMore(&hasMore);
284284
while (hasMore) {
285285
nsString* nextAddress = addresses.AppendElement(fallible);
286286
if (!nextAddress) {
287287
return NS_ERROR_OUT_OF_MEMORY;
288288
}
289289

290290
nsCString nextAddressASCII;
291-
record->GetNextAddrAsString(nextAddressASCII);
291+
aRecord->GetNextAddrAsString(nextAddressASCII);
292292
CopyASCIItoUTF16(nextAddressASCII, *nextAddress);
293-
record->HasMore(&hasMore);
293+
aRecord->HasMore(&hasMore);
294294
}
295295
} else {
296296
dict.mAnswer = false;
@@ -768,9 +768,9 @@ Dashboard::RequestDNSLookup(const nsACString& aHost,
768768
"nsINetDashboardCallback", aCallback, true);
769769
helper->mEventTarget = GetCurrentEventTarget();
770770
OriginAttributes attrs;
771-
rv = mDnsService->AsyncResolveNative(
772-
aHost, nsIDNSService::RESOLVE_TYPE_DEFAULT, 0, nullptr, helper.get(),
773-
NS_GetCurrentThread(), attrs, getter_AddRefs(helper->mCancel));
771+
rv = mDnsService->AsyncResolveNative(aHost, 0, helper.get(),
772+
NS_GetCurrentThread(), attrs,
773+
getter_AddRefs(helper->mCancel));
774774
return rv;
775775
}
776776

‎netwerk/base/NetworkConnectivityService.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,18 +130,16 @@ NetworkConnectivityService::RecheckDNS() {
130130
Preferences::GetCString("network.connectivity-service.DNSv4.domain", host);
131131

132132
rv = dns->AsyncResolveNative(
133-
host, nsIDNSService::RESOLVE_TYPE_DEFAULT,
133+
host,
134134
nsIDNSService::RESOLVE_DISABLE_IPV6 | nsIDNSService::RESOLVE_DISABLE_TRR,
135-
nullptr, this, NS_GetCurrentThread(), attrs,
136-
getter_AddRefs(mDNSv4Request));
135+
this, NS_GetCurrentThread(), attrs, getter_AddRefs(mDNSv4Request));
137136
NS_ENSURE_SUCCESS(rv, rv);
138137

139138
Preferences::GetCString("network.connectivity-service.DNSv6.domain", host);
140139
rv = dns->AsyncResolveNative(
141-
host, nsIDNSService::RESOLVE_TYPE_DEFAULT,
140+
host,
142141
nsIDNSService::RESOLVE_DISABLE_IPV4 | nsIDNSService::RESOLVE_DISABLE_TRR,
143-
nullptr, this, NS_GetCurrentThread(), attrs,
144-
getter_AddRefs(mDNSv6Request));
142+
this, NS_GetCurrentThread(), attrs, getter_AddRefs(mDNSv6Request));
145143
return rv;
146144
}
147145

‎netwerk/base/Predictor.cpp

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,25 +1187,24 @@ bool Predictor::RunPredictions(nsIURI* referrer,
11871187
uri->GetAsciiHost(hostname);
11881188
PREDICTOR_LOG((" doing preresolve %s", hostname.get()));
11891189
nsCOMPtr<nsICancelable> tmpCancelable;
1190-
mDnsService->AsyncResolveNative(
1191-
hostname, nsIDNSService::RESOLVE_TYPE_DEFAULT,
1192-
(nsIDNSService::RESOLVE_PRIORITY_MEDIUM |
1193-
nsIDNSService::RESOLVE_SPECULATE),
1194-
nullptr, mDNSListener, nullptr, originAttributes,
1195-
getter_AddRefs(tmpCancelable));
1190+
mDnsService->AsyncResolveNative(hostname,
1191+
(nsIDNSService::RESOLVE_PRIORITY_MEDIUM |
1192+
nsIDNSService::RESOLVE_SPECULATE),
1193+
mDNSListener, nullptr, originAttributes,
1194+
getter_AddRefs(tmpCancelable));
11961195

11971196
// Fetch esni keys if needed.
11981197
if (StaticPrefs::network_security_esni_enabled() &&
11991198
uri->SchemeIs("https")) {
12001199
nsAutoCString esniHost;
12011200
esniHost.Append("_esni.");
12021201
esniHost.Append(hostname);
1203-
mDnsService->AsyncResolveNative(esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
1204-
(nsIDNSService::RESOLVE_PRIORITY_MEDIUM |
1205-
nsIDNSService::RESOLVE_SPECULATE),
1206-
nullptr, mDNSListener, nullptr,
1207-
originAttributes,
1208-
getter_AddRefs(tmpCancelable));
1202+
mDnsService->AsyncResolveByTypeNative(
1203+
esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
1204+
(nsIDNSService::RESOLVE_PRIORITY_MEDIUM |
1205+
nsIDNSService::RESOLVE_SPECULATE),
1206+
mDNSListener, nullptr, originAttributes,
1207+
getter_AddRefs(tmpCancelable));
12091208
}
12101209

12111210
predicted = true;

‎netwerk/base/ProxyAutoConfig.cpp

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,9 @@ bool ProxyAutoConfig::ResolveAddress(const nsCString& aHostName,
448448
nsIDNSService::RESOLVE_PRIORITY_MEDIUM |
449449
nsIDNSService::GetFlagsFromTRRMode(nsIRequest::TRR_DISABLED_MODE);
450450

451-
if (NS_FAILED(dns->AsyncResolveNative(
452-
aHostName, nsIDNSService::RESOLVE_TYPE_DEFAULT, flags, nullptr,
453-
helper, GetCurrentEventTarget(), attrs,
454-
getter_AddRefs(helper->mRequest)))) {
451+
if (NS_FAILED(dns->AsyncResolveNative(aHostName, flags, helper,
452+
GetCurrentEventTarget(), attrs,
453+
getter_AddRefs(helper->mRequest)))) {
455454
return false;
456455
}
457456

@@ -479,15 +478,9 @@ bool ProxyAutoConfig::ResolveAddress(const nsCString& aHostName,
479478
return false;
480479
});
481480

482-
if (NS_FAILED(helper->mStatus)) {
481+
if (NS_FAILED(helper->mStatus) ||
482+
NS_FAILED(helper->mResponse->GetNextAddr(0, aNetAddr)))
483483
return false;
484-
}
485-
486-
nsCOMPtr<nsIDNSAddrRecord> rec = do_QueryInterface(helper->mResponse);
487-
if (!rec || NS_FAILED(rec->GetNextAddr(0, aNetAddr))) {
488-
return false;
489-
}
490-
491484
return true;
492485
}
493486

‎netwerk/base/nsDNSPrefetch.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ nsresult nsDNSPrefetch::Prefetch(uint32_t flags) {
7676
flags |= nsIDNSService::GetFlagsFromTRRMode(mTRRMode);
7777

7878
nsresult rv = sDNSService->AsyncResolveNative(
79-
mHostname, nsIDNSService::RESOLVE_TYPE_DEFAULT,
80-
flags | nsIDNSService::RESOLVE_SPECULATE, nullptr, this, target,
79+
mHostname, flags | nsIDNSService::RESOLVE_SPECULATE, this, target,
8180
mOriginAttributes, getter_AddRefs(tmpOutstanding));
8281
if (NS_FAILED(rv)) {
8382
return rv;
@@ -88,10 +87,10 @@ nsresult nsDNSPrefetch::Prefetch(uint32_t flags) {
8887
nsAutoCString esniHost;
8988
esniHost.Append("_esni.");
9089
esniHost.Append(mHostname);
91-
sDNSService->AsyncResolveNative(esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
92-
flags | nsIDNSService::RESOLVE_SPECULATE,
93-
nullptr, this, target, mOriginAttributes,
94-
getter_AddRefs(tmpOutstanding));
90+
sDNSService->AsyncResolveByTypeNative(
91+
esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
92+
flags | nsIDNSService::RESOLVE_SPECULATE, this, target,
93+
mOriginAttributes, getter_AddRefs(tmpOutstanding));
9594
}
9695
return NS_OK;
9796
}

‎netwerk/base/nsSocketTransport2.cpp

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,10 +1064,9 @@ nsresult nsSocketTransport::ResolveHost() {
10641064
SOCKET_LOG(("nsSocketTransport %p origin %s doing dns for %s\n", this,
10651065
mOriginHost.get(), SocketHost().get()));
10661066
}
1067-
rv =
1068-
dns->AsyncResolveNative(SocketHost(), nsIDNSService::RESOLVE_TYPE_DEFAULT,
1069-
dnsFlags, nullptr, this, mSocketTransportService,
1070-
mOriginAttributes, getter_AddRefs(mDNSRequest));
1067+
rv = dns->AsyncResolveNative(SocketHost(), dnsFlags, this,
1068+
mSocketTransportService, mOriginAttributes,
1069+
getter_AddRefs(mDNSRequest));
10711070
mEsniQueried = false;
10721071
if (mSocketTransportService->IsEsniEnabled() && NS_SUCCEEDED(rv) &&
10731072
!(mConnectionFlags & (DONT_TRY_ESNI | BE_CONSERVATIVE))) {
@@ -1085,10 +1084,10 @@ nsresult nsSocketTransport::ResolveHost() {
10851084
// This might end up being the SocketHost
10861085
// see https://github.com/ekr/draft-rescorla-tls-esni/issues/61
10871086
esniHost.Append(SocketHost());
1088-
rv = dns->AsyncResolveNative(esniHost, nsIDNSService::RESOLVE_TYPE_TXT,
1089-
dnsFlags, nullptr, this,
1090-
mSocketTransportService, mOriginAttributes,
1091-
getter_AddRefs(mDNSTxtRequest));
1087+
rv = dns->AsyncResolveByTypeNative(
1088+
esniHost, nsIDNSService::RESOLVE_TYPE_TXT, dnsFlags, this,
1089+
mSocketTransportService, mOriginAttributes,
1090+
getter_AddRefs(mDNSTxtRequest));
10921091
if (NS_FAILED(rv)) {
10931092
SOCKET_LOG((" dns request by type failed."));
10941093
mDNSTxtRequest = nullptr;
@@ -3012,8 +3011,7 @@ nsSocketTransport::OnLookupComplete(nsICancelable* request, nsIDNSRecord* rec,
30123011
if (NS_FAILED(status) && mDNSTxtRequest) {
30133012
mDNSTxtRequest->Cancel(NS_ERROR_ABORT);
30143013
} else if (NS_SUCCEEDED(status)) {
3015-
mDNSRecord = do_QueryInterface(rec);
3016-
MOZ_ASSERT(mDNSRecord);
3014+
mDNSRecord = rec;
30173015
}
30183016

30193017
// flag host lookup complete for the benefit of the ResolveHost method.
@@ -3044,8 +3042,7 @@ nsSocketTransport::OnLookupComplete(nsICancelable* request, nsIDNSRecord* rec,
30443042
// nsIInterfaceRequestor
30453043
NS_IMETHODIMP
30463044
nsSocketTransport::GetInterface(const nsIID& iid, void** result) {
3047-
if (iid.Equals(NS_GET_IID(nsIDNSRecord)) ||
3048-
iid.Equals(NS_GET_IID(nsIDNSAddrRecord))) {
3045+
if (iid.Equals(NS_GET_IID(nsIDNSRecord))) {
30493046
return mDNSRecord ? mDNSRecord->QueryInterface(iid, result)
30503047
: NS_ERROR_NO_INTERFACE;
30513048
}

0 commit comments

Comments
 (0)