OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "net/dns/mojo_host_resolver_impl.h" | 5 #include "net/dns/mojo_host_resolver_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
10 #include "net/base/address_list.h" | 10 #include "net/base/address_list.h" |
11 #include "net/base/net_errors.h" | 11 #include "net/base/net_errors.h" |
12 #include "net/base/network_interfaces.h" | 12 #include "net/base/network_interfaces.h" |
13 #include "net/dns/host_resolver.h" | 13 #include "net/dns/host_resolver.h" |
14 #include "net/dns/mojo_host_type_converters.h" | 14 #include "net/dns/mojo_host_type_converters.h" |
15 | 15 |
16 namespace net { | 16 namespace net { |
17 | 17 |
18 // Handles host resolution for a single request and sends a response when done. | 18 // Handles host resolution for a single request and sends a response when done. |
19 // Also detects connection errors for HostResolverRequestClient and cancels the | 19 // Also detects connection errors for HostResolverRequestClient and cancels the |
20 // outstanding resolve request. Owned by MojoHostResolverImpl. | 20 // outstanding resolve request. Owned by MojoHostResolverImpl. |
21 class MojoHostResolverImpl::Job { | 21 class MojoHostResolverImpl::Job { |
22 public: | 22 public: |
23 Job(MojoHostResolverImpl* resolver_service, | 23 Job(MojoHostResolverImpl* resolver_service, |
24 net::HostResolver* resolver, | 24 net::HostResolver* resolver, |
25 const net::HostResolver::RequestInfo& request_info, | 25 const net::HostResolver::RequestInfo& request_info, |
26 const BoundNetLog& net_log, | 26 const NetLogWithSource& net_log, |
27 interfaces::HostResolverRequestClientPtr client); | 27 interfaces::HostResolverRequestClientPtr client); |
28 ~Job(); | 28 ~Job(); |
29 | 29 |
30 void Start(); | 30 void Start(); |
31 | 31 |
32 private: | 32 private: |
33 // Completion callback for the HostResolver::Resolve request. | 33 // Completion callback for the HostResolver::Resolve request. |
34 void OnResolveDone(int result); | 34 void OnResolveDone(int result); |
35 | 35 |
36 // Mojo error handler. | 36 // Mojo error handler. |
37 void OnConnectionError(); | 37 void OnConnectionError(); |
38 | 38 |
39 MojoHostResolverImpl* resolver_service_; | 39 MojoHostResolverImpl* resolver_service_; |
40 net::HostResolver* resolver_; | 40 net::HostResolver* resolver_; |
41 net::HostResolver::RequestInfo request_info_; | 41 net::HostResolver::RequestInfo request_info_; |
42 const BoundNetLog net_log_; | 42 const NetLogWithSource net_log_; |
43 interfaces::HostResolverRequestClientPtr client_; | 43 interfaces::HostResolverRequestClientPtr client_; |
44 std::unique_ptr<net::HostResolver::Request> request_; | 44 std::unique_ptr<net::HostResolver::Request> request_; |
45 AddressList result_; | 45 AddressList result_; |
46 base::ThreadChecker thread_checker_; | 46 base::ThreadChecker thread_checker_; |
47 }; | 47 }; |
48 | 48 |
49 MojoHostResolverImpl::MojoHostResolverImpl(net::HostResolver* resolver, | 49 MojoHostResolverImpl::MojoHostResolverImpl(net::HostResolver* resolver, |
50 const BoundNetLog& net_log) | 50 const NetLogWithSource& net_log) |
51 : resolver_(resolver), net_log_(net_log) { | 51 : resolver_(resolver), net_log_(net_log) {} |
52 } | |
53 | 52 |
54 MojoHostResolverImpl::~MojoHostResolverImpl() { | 53 MojoHostResolverImpl::~MojoHostResolverImpl() { |
55 DCHECK(thread_checker_.CalledOnValidThread()); | 54 DCHECK(thread_checker_.CalledOnValidThread()); |
56 base::STLDeleteElements(&pending_jobs_); | 55 base::STLDeleteElements(&pending_jobs_); |
57 } | 56 } |
58 | 57 |
59 void MojoHostResolverImpl::Resolve( | 58 void MojoHostResolverImpl::Resolve( |
60 interfaces::HostResolverRequestInfoPtr request_info, | 59 interfaces::HostResolverRequestInfoPtr request_info, |
61 interfaces::HostResolverRequestClientPtr client) { | 60 interfaces::HostResolverRequestClientPtr client) { |
62 DCHECK(thread_checker_.CalledOnValidThread()); | 61 DCHECK(thread_checker_.CalledOnValidThread()); |
(...skipping 15 matching lines...) Expand all Loading... |
78 DCHECK(thread_checker_.CalledOnValidThread()); | 77 DCHECK(thread_checker_.CalledOnValidThread()); |
79 size_t num_erased = pending_jobs_.erase(job); | 78 size_t num_erased = pending_jobs_.erase(job); |
80 DCHECK(num_erased); | 79 DCHECK(num_erased); |
81 delete job; | 80 delete job; |
82 } | 81 } |
83 | 82 |
84 MojoHostResolverImpl::Job::Job( | 83 MojoHostResolverImpl::Job::Job( |
85 MojoHostResolverImpl* resolver_service, | 84 MojoHostResolverImpl* resolver_service, |
86 net::HostResolver* resolver, | 85 net::HostResolver* resolver, |
87 const net::HostResolver::RequestInfo& request_info, | 86 const net::HostResolver::RequestInfo& request_info, |
88 const BoundNetLog& net_log, | 87 const NetLogWithSource& net_log, |
89 interfaces::HostResolverRequestClientPtr client) | 88 interfaces::HostResolverRequestClientPtr client) |
90 : resolver_service_(resolver_service), | 89 : resolver_service_(resolver_service), |
91 resolver_(resolver), | 90 resolver_(resolver), |
92 request_info_(request_info), | 91 request_info_(request_info), |
93 net_log_(net_log), | 92 net_log_(net_log), |
94 client_(std::move(client)) { | 93 client_(std::move(client)) { |
95 client_.set_connection_error_handler(base::Bind( | 94 client_.set_connection_error_handler(base::Bind( |
96 &MojoHostResolverImpl::Job::OnConnectionError, base::Unretained(this))); | 95 &MojoHostResolverImpl::Job::OnConnectionError, base::Unretained(this))); |
97 } | 96 } |
98 | 97 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 void MojoHostResolverImpl::Job::OnConnectionError() { | 130 void MojoHostResolverImpl::Job::OnConnectionError() { |
132 DCHECK(thread_checker_.CalledOnValidThread()); | 131 DCHECK(thread_checker_.CalledOnValidThread()); |
133 // |resolver_service_| should always outlive us. | 132 // |resolver_service_| should always outlive us. |
134 DCHECK(resolver_service_); | 133 DCHECK(resolver_service_); |
135 DVLOG(1) << "Connection error on request for " | 134 DVLOG(1) << "Connection error on request for " |
136 << request_info_.host_port_pair().ToString(); | 135 << request_info_.host_port_pair().ToString(); |
137 resolver_service_->DeleteJob(this); | 136 resolver_service_->DeleteJob(this); |
138 } | 137 } |
139 | 138 |
140 } // namespace net | 139 } // namespace net |
OLD | NEW |