| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chromeos/network/host_resolver_impl_chromeos.h" | 5 #include "chromeos/network/host_resolver_impl_chromeos.h" |
| 6 | 6 |
| 7 #include "base/message_loop/message_loop_proxy.h" | 7 #include "base/message_loop/message_loop_proxy.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "chromeos/network/device_state.h" | 9 #include "chromeos/network/device_state.h" |
| 10 #include "chromeos/network/network_handler.h" | 10 #include "chromeos/network/network_handler.h" |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 const std::string& ipv6_address) { | 155 const std::string& ipv6_address) { |
| 156 DCHECK(thread_checker_.CalledOnValidThread()); | 156 DCHECK(thread_checker_.CalledOnValidThread()); |
| 157 ipv4_address_ = ipv4_address; | 157 ipv4_address_ = ipv4_address; |
| 158 ipv6_address_ = ipv6_address; | 158 ipv6_address_ = ipv6_address; |
| 159 } | 159 } |
| 160 | 160 |
| 161 bool HostResolverImplChromeOS::ResolveLocalIPAddress( | 161 bool HostResolverImplChromeOS::ResolveLocalIPAddress( |
| 162 const RequestInfo& info, | 162 const RequestInfo& info, |
| 163 net::AddressList* addresses) { | 163 net::AddressList* addresses) { |
| 164 DCHECK(thread_checker_.CalledOnValidThread()); | 164 DCHECK(thread_checker_.CalledOnValidThread()); |
| 165 if (info.hostname() != net::GetHostName() || ipv4_address_.empty()) | 165 if (!(info.host_resolver_flags() & net::HOST_RESOLVER_MY_IP_ADDRESS) || |
| 166 info.hostname() != net::GetHostName() || |
| 167 ipv4_address_.empty()) { |
| 166 return false; | 168 return false; |
| 169 } |
| 167 | 170 |
| 168 // Use IPConfig data for localhost address lookup. | 171 // Use IPConfig data for localhost address lookup. |
| 169 addresses->clear(); | 172 addresses->clear(); |
| 170 | 173 |
| 171 if (info.address_family() != net::ADDRESS_FAMILY_IPV4 && | 174 if (info.address_family() != net::ADDRESS_FAMILY_IPV4 && |
| 172 !ipv6_address_.empty()) { | 175 !ipv6_address_.empty()) { |
| 173 net::IPAddressNumber ipv6; | 176 net::IPAddressNumber ipv6; |
| 174 if (net::ParseIPLiteralToNumber(ipv6_address_, &ipv6)) | 177 if (net::ParseIPLiteralToNumber(ipv6_address_, &ipv6)) |
| 175 addresses->push_back(net::IPEndPoint(ipv6, 0)); | 178 addresses->push_back(net::IPEndPoint(ipv6, 0)); |
| 176 } | 179 } |
| (...skipping 28 matching lines...) Expand all Loading... |
| 205 NetworkStateHandler* network_state_handler) { | 208 NetworkStateHandler* network_state_handler) { |
| 206 Options options; | 209 Options options; |
| 207 return scoped_ptr<net::HostResolver>(new HostResolverImplChromeOS( | 210 return scoped_ptr<net::HostResolver>(new HostResolverImplChromeOS( |
| 208 network_handler_message_loop, | 211 network_handler_message_loop, |
| 209 network_state_handler, | 212 network_state_handler, |
| 210 options, | 213 options, |
| 211 NULL)); | 214 NULL)); |
| 212 } | 215 } |
| 213 | 216 |
| 214 } // namespace chromeos | 217 } // namespace chromeos |
| OLD | NEW |