| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/single_request_host_resolver.h" | 5 #include "net/dns/single_request_host_resolver.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/memory/ptr_util.h" |
| 12 #include "net/base/address_list.h" |
| 11 #include "net/base/net_errors.h" | 13 #include "net/base/net_errors.h" |
| 12 | 14 |
| 13 namespace net { | 15 namespace net { |
| 14 | 16 |
| 15 SingleRequestHostResolver::SingleRequestHostResolver(HostResolver* resolver) | 17 SingleRequestHostResolver::SingleRequestHostResolver(HostResolver* resolver) |
| 16 : resolver_(resolver), | 18 : resolver_(resolver), |
| 17 cur_request_(NULL), | 19 cur_request_(NULL), |
| 18 callback_( | 20 callback_(base::Bind(&SingleRequestHostResolver::OnResolveCompletion, |
| 19 base::Bind(&SingleRequestHostResolver::OnResolveCompletion, | 21 base::Unretained(this))), |
| 20 base::Unretained(this))) { | 22 default_addresses_(nullptr) { |
| 21 DCHECK(resolver_ != NULL); | 23 DCHECK(resolver_ != NULL); |
| 22 } | 24 } |
| 23 | 25 |
| 24 SingleRequestHostResolver::~SingleRequestHostResolver() { | 26 SingleRequestHostResolver::~SingleRequestHostResolver() { |
| 25 Cancel(); | 27 Cancel(); |
| 26 } | 28 } |
| 27 | 29 |
| 28 int SingleRequestHostResolver::Resolve(const HostResolver::RequestInfo& info, | 30 int SingleRequestHostResolver::Resolve(const HostResolver::RequestInfo& info, |
| 29 RequestPriority priority, | 31 RequestPriority priority, |
| 30 AddressList* addresses, | 32 AddressList* addresses, |
| 31 const CompletionCallback& callback, | 33 const CompletionCallback& callback, |
| 32 const BoundNetLog& net_log) { | 34 const BoundNetLog& net_log) { |
| 33 DCHECK(addresses); | |
| 34 DCHECK_EQ(false, callback.is_null()); | 35 DCHECK_EQ(false, callback.is_null()); |
| 35 DCHECK(cur_request_callback_.is_null()) << "resolver already in use"; | 36 DCHECK(cur_request_callback_.is_null()) << "resolver already in use"; |
| 36 | 37 |
| 38 if (!addresses) { |
| 39 default_addresses_ = base::WrapUnique(new AddressList); |
| 40 addresses = default_addresses_.get(); |
| 41 } |
| 42 |
| 37 HostResolver::RequestHandle request = NULL; | 43 HostResolver::RequestHandle request = NULL; |
| 38 | 44 |
| 39 // We need to be notified of completion before |callback| is called, so that | 45 // We need to be notified of completion before |callback| is called, so that |
| 40 // we can clear out |cur_request_*|. | 46 // we can clear out |cur_request_*|. |
| 41 CompletionCallback transient_callback = | 47 CompletionCallback transient_callback = |
| 42 callback.is_null() ? CompletionCallback() : callback_; | 48 callback.is_null() ? CompletionCallback() : callback_; |
| 43 | 49 |
| 44 int rv = resolver_->Resolve( | 50 int rv = resolver_->Resolve( |
| 45 info, priority, addresses, transient_callback, &request, net_log); | 51 info, priority, addresses, transient_callback, &request, net_log); |
| 46 | 52 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 70 | 76 |
| 71 // Clear the outstanding request information. | 77 // Clear the outstanding request information. |
| 72 cur_request_ = NULL; | 78 cur_request_ = NULL; |
| 73 cur_request_callback_.Reset(); | 79 cur_request_callback_.Reset(); |
| 74 | 80 |
| 75 // Call the user's original callback. | 81 // Call the user's original callback. |
| 76 callback.Run(result); | 82 callback.Run(result); |
| 77 } | 83 } |
| 78 | 84 |
| 79 } // namespace net | 85 } // namespace net |
| OLD | NEW |