corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1900013 - Remove TRR fallback warning code from DNS code r=acreskey,necko-reviewers,kershaw

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D237542
This commit is contained in:
Valentin Gosu
2025-02-12 14:30:26 +00:00
parent ac4aa54863
commit 0473ae7be6
4 changed files with 0 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
netwerk/dns/nsHostResolver.cpp
View File

@@ -1114,16 +1114,6 @@ void nsHostResolver::ComputeEffectiveTRRMode(nsHostRecord* aRec) {
if ((requestMode == nsIRequest::TRR_DEFAULT_MODE &&
resolverMode == nsIDNSService::MODE_NATIVEONLY)) {
if (StaticPrefs::network_trr_display_fallback_warning()) {
TRRSkippedReason heuristicResult =
TRRService::Get()->GetHeuristicDetectionResult();
if (heuristicResult != TRRSkippedReason::TRR_UNSET &&
heuristicResult != TRRSkippedReason::TRR_OK) {
aRec->RecordReason(heuristicResult);
aRec->mEffectiveTRRMode = nsIRequest::TRR_DISABLED_MODE;
return;
}
}
aRec->RecordReason(TRRSkippedReason::TRR_MODE_NOT_ENABLED);
aRec->mEffectiveTRRMode = nsIRequest::TRR_DISABLED_MODE;
return;
@@ -1218,38 +1208,6 @@ nsresult nsHostResolver::NameLookup(nsHostRecord* rec,
MOZ_ASSERT_IF(addrRec, addrRec->mResolverType == DNSResolverType::Native);
#endif
// We did not lookup via TRR - don't fallback to native if the
// network.trr.display_fallback_warning pref is set and either
// 1. we are in TRR first mode and confirmation failed
// 2. the record has trr_disabled and a heuristic skip reason
if (StaticPrefs::network_trr_display_fallback_warning() &&
rec->mEffectiveTRRMode != nsIRequest::TRR_ONLY_MODE) {
if ((rec->mEffectiveTRRMode == nsIRequest::TRR_FIRST_MODE &&
rec->mTRRSkippedReason == TRRSkippedReason::TRR_NOT_CONFIRMED) ||
(rec->mEffectiveTRRMode == nsIRequest::TRR_DISABLED_MODE &&
rec->mTRRSkippedReason >=
nsITRRSkipReason::TRR_HEURISTIC_TRIPPED_GOOGLE_SAFESEARCH &&
rec->mTRRSkippedReason <=
nsITRRSkipReason::TRR_HEURISTIC_TRIPPED_NRPT)) {
LOG((
"NameLookup: ResolveHostComplete with status NS_ERROR_UNKNOWN_HOST "
"for: %s effectiveTRRmode: "
"%d SkippedReason: %d",
rec->host.get(),
static_cast<nsIRequest::TRRMode>(rec->mEffectiveTRRMode),
static_cast<int32_t>(rec->mTRRSkippedReason)));
mozilla::LinkedList<RefPtr<nsResolveHostCallback>> cbs =
std::move(rec->mCallbacks);
for (nsResolveHostCallback* c = cbs.getFirst(); c;
c = c->removeAndGetNext()) {
c->OnResolveHostComplete(this, rec, NS_ERROR_UNKNOWN_HOST);
}
return NS_OK;
}
}
rv = NativeLookup(rec, aLock);
}