Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(211)

Unified Diff: net/dns/async_host_resolver.cc

Issue 9369045: [net] HostResolverImpl + DnsTransaction + DnsConfigService = Asynchronous DNS ready for experiments. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ready for test-drive. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/dns/async_host_resolver.cc
diff --git a/net/dns/async_host_resolver.cc b/net/dns/async_host_resolver.cc
index 72e5472419daf4df4983a4a4c60b7b80b1350d6b..5ce1685c6ab9503546bca8121d95dfedfc434886 100644
--- a/net/dns/async_host_resolver.cc
+++ b/net/dns/async_host_resolver.cc
@@ -347,7 +347,6 @@ void AsyncHostResolver::OnDnsTransactionComplete(
std::make_pair(transaction->GetHostname(), transaction->GetType()));
DCHECK(rit != requestlist_map_.end());
RequestList& requests = rit->second;
- int port = requests.empty() ? 80 : requests.front()->info().port();
// Extract AddressList and TTL out of DnsResponse.
AddressList addr_list;
@@ -367,11 +366,16 @@ void AsyncHostResolver::OnDnsTransactionComplete(
}
}
if (!ip_addresses.empty())
- addr_list = AddressList::CreateFromIPAddressList(ip_addresses, port);
+ addr_list = AddressList::CreateFromIPAddressList(ip_addresses, "");
else
result = ERR_NAME_NOT_RESOLVED;
}
+ // NOTE: This is here only to compile, but async_host_resolver* is going
cbentzel 2012/02/10 19:51:08 Is this note still correct?
szym 2012/02/10 21:49:36 I haven't removed async_host_resolver* yet, but th
+ // away in this CL.
+ int port = requests.empty() ? 80 : requests.front()->info().port();
+ addr_list.SetPort(port);
+
// Run callback of every request that was depending on this DNS request,
// also notify observers.
for (RequestList::iterator it = requests.begin(); it != requests.end(); ++it)

Powered by Google App Engine
This is Rietveld 408576698