diff options
author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 19:12:57 +0000 |
---|---|---|
committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-21 19:12:57 +0000 |
commit | 123ab1e334b44051297c8d4242e81044478c6588 (patch) | |
tree | 7ba32a449e6715f5f4bace667b161b129745b78d /net/base/host_resolver_impl_unittest.cc | |
parent | 57d1ec8fc4b72112bd4d32df76c55395bf33681a (diff) | |
download | chromium_src-123ab1e334b44051297c8d4242e81044478c6588.zip chromium_src-123ab1e334b44051297c8d4242e81044478c6588.tar.gz chromium_src-123ab1e334b44051297c8d4242e81044478c6588.tar.bz2 |
Add a mechanism to disable IPv6.
(1) Adds the ability to specify the address family on a per-request basis.
(2) Exposes a --disable-ipv6 flag to chrome that changes the default address family from AF_UNSPEC to AF_INET (same sort of thing Firefox does).
(3) Changes the backing datastructure for HostCache:EntryMap and HostResolverImpl::JobMap from a "hash_map" to a "std::map". This was for consistency with other code (when I went to add a custom hash trait, I couldn't find any existing code which was using hashmap for custom keys).
(4) Updates about:net-internals to display an address family for the hostcache dump (since it is now a part of the key).
This change is in anticipation of turning off IPv6 host resolving in the PAC utility functions (see bug 24641). But it is also a feature addition.
BUG=24641
TEST=HostCacheTest.AddressFamilyIsPartOfKey
Review URL: http://codereview.chromium.org/302010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/host_resolver_impl_unittest.cc')
-rw-r--r-- | net/base/host_resolver_impl_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/base/host_resolver_impl_unittest.cc b/net/base/host_resolver_impl_unittest.cc index fd35d88..eee6fd1 100644 --- a/net/base/host_resolver_impl_unittest.cc +++ b/net/base/host_resolver_impl_unittest.cc @@ -46,13 +46,15 @@ class CapturingHostResolverProc : public HostResolverProc { event_.Signal(); } - virtual int Resolve(const std::string& host, AddressList* addrlist) { + virtual int Resolve(const std::string& host, + AddressFamily address_family, + AddressList* addrlist) { event_.Wait(); { AutoLock l(lock_); capture_list_.push_back(host); } - return ResolveUsingPrevious(host, addrlist); + return ResolveUsingPrevious(host, address_family, addrlist); } std::vector<std::string> GetCaptureList() const { |