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

Backed out changeset 8b355ea0021b (bug 1910593) for causing bc failures @ nsHttpConnectionMgr.cpp CLOSED TREE

Browse Source
This commit is contained in:
Sandor Molnar
2024-09-10 18:59:32 +03:00
parent 05645328cd
commit b911875a30
15 changed files with 106 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
netwerk/dns/nsHostResolver.cpp
View File

@@ -2035,13 +2035,20 @@ void nsHostResolver::GetDNSCacheEntries(nsTArray<DNSCacheEntries>* args) {
continue;
}
DNSCacheEntries info;
info.resolveType = rec->type;
info.hostname = rec->host;
info.family = rec->af;
if (rec->mValidEnd.IsNull()) {
// For now we only show A/AAAA records.
if (!rec->IsAddrRecord()) {
continue;
}
RefPtr<AddrHostRecord> addrRec = do_QueryObject(rec);
MOZ_ASSERT(addrRec);
if (!addrRec || !addrRec->addr_info) {
continue;
}
DNSCacheEntries info;
info.hostname = rec->host;
info.family = rec->af;
info.expiration =
(int64_t)(rec->mValidEnd - TimeStamp::NowLoRes()).ToSeconds();
if (info.expiration <= 0) {
@@ -2049,12 +2056,7 @@ void nsHostResolver::GetDNSCacheEntries(nsTArray<DNSCacheEntries>* args) {
continue;
}
info.originAttributesSuffix = recordEntry.GetKey().originSuffix;
info.flags = nsPrintfCString("%u|0x%x|%u|%d|%s", rec->type, rec->flags,
rec->af, rec->pb, rec->mTrrServer.get());
RefPtr<AddrHostRecord> addrRec = do_QueryObject(rec);
if (addrRec && addrRec->addr_info) {
{
MutexAutoLock lock(addrRec->addr_info_lock);
for (const auto& addr : addrRec->addr_info->Addresses()) {
char buf[kIPv6CStrBufSize];
@@ -2065,6 +2067,10 @@ void nsHostResolver::GetDNSCacheEntries(nsTArray<DNSCacheEntries>* args) {
info.TRR = addrRec->addr_info->IsTRR();
}
info.originAttributesSuffix = recordEntry.GetKey().originSuffix;
info.flags = nsPrintfCString("%u|0x%x|%u|%d|%s", rec->type, rec->flags,
rec->af, rec->pb, rec->mTrrServer.get());
args->AppendElement(std::move(info));
}
}