OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright 2008 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2008 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #include "webrtc/base/nethelpers.h" | 11 #include "webrtc/base/nethelpers.h" |
12 | 12 |
13 #include <memory> | 13 #include <memory> |
14 | 14 |
15 #if defined(WEBRTC_WIN) | 15 #if defined(WEBRTC_WIN) |
16 #include <ws2spi.h> | 16 #include <ws2spi.h> |
17 #include <ws2tcpip.h> | 17 #include <ws2tcpip.h> |
18 #include "webrtc/base/win32.h" | 18 #include "webrtc/base/win32.h" |
19 #endif | 19 #endif |
20 #if defined(WEBRTC_POSIX) && !defined(__native_client__) | 20 #if defined(WEBRTC_POSIX) && !defined(__native_client__) |
21 #if defined(WEBRTC_ANDROID) | 21 #if defined(WEBRTC_ANDROID) |
22 #include "webrtc/base/ifaddrs-android.h" | 22 #include "webrtc/base/ifaddrs-android.h" |
23 #else | 23 #else |
24 #include <ifaddrs.h> | 24 #include <ifaddrs.h> |
25 #endif | 25 #endif |
26 #endif // defined(WEBRTC_POSIX) && !defined(__native_client__) | 26 #endif // defined(WEBRTC_POSIX) && !defined(__native_client__) |
27 | 27 |
28 #include "webrtc/base/bind.h" | |
28 #include "webrtc/base/byteorder.h" | 29 #include "webrtc/base/byteorder.h" |
29 #include "webrtc/base/checks.h" | 30 #include "webrtc/base/checks.h" |
30 #include "webrtc/base/logging.h" | 31 #include "webrtc/base/logging.h" |
31 #include "webrtc/base/signalthread.h" | 32 #include "webrtc/base/ptr_util.h" |
33 #include "webrtc/base/task_queue.h" | |
34 #include "webrtc/base/thread.h" | |
32 | 35 |
33 namespace rtc { | 36 namespace rtc { |
34 | 37 |
38 namespace { | |
35 int ResolveHostname(const std::string& hostname, int family, | 39 int ResolveHostname(const std::string& hostname, int family, |
36 std::vector<IPAddress>* addresses) { | 40 std::vector<IPAddress>* addresses) { |
37 #ifdef __native_client__ | 41 #ifdef __native_client__ |
38 RTC_NOTREACHED(); | 42 RTC_NOTREACHED(); |
39 LOG(LS_WARNING) << "ResolveHostname() is not implemented for NaCl"; | 43 LOG(LS_WARNING) << "ResolveHostname() is not implemented for NaCl"; |
40 return -1; | 44 return -1; |
41 #else // __native_client__ | 45 #else // __native_client__ |
42 if (!addresses) { | 46 if (!addresses) { |
43 return -1; | 47 return -1; |
44 } | 48 } |
(...skipping 29 matching lines...) Expand all Loading... | |
74 IPAddress ip; | 78 IPAddress ip; |
75 if (IPFromAddrInfo(cursor, &ip)) { | 79 if (IPFromAddrInfo(cursor, &ip)) { |
76 addresses->push_back(ip); | 80 addresses->push_back(ip); |
77 } | 81 } |
78 } | 82 } |
79 } | 83 } |
80 freeaddrinfo(result); | 84 freeaddrinfo(result); |
81 return 0; | 85 return 0; |
82 #endif // !__native_client__ | 86 #endif // !__native_client__ |
83 } | 87 } |
88 } // namespace | |
84 | 89 |
85 // AsyncResolver | 90 // AsyncResolver |
86 AsyncResolver::AsyncResolver() | 91 AsyncResolver::AsyncResolver() |
87 : SignalThread(false /* use_socket_server */), error_(-1) {} | 92 : construction_thread_(Thread::Current()) {} |
tommi
2017/06/19 13:01:47
add RTC_DCHECK that construction_thread_ is never
nisse-webrtc
2017/06/19 14:07:20
Done.
| |
88 | 93 |
89 AsyncResolver::~AsyncResolver() = default; | 94 AsyncResolver::~AsyncResolver() { |
95 RTC_DCHECK(construction_thread_->IsCurrent()); | |
96 } | |
90 | 97 |
91 void AsyncResolver::Start(const SocketAddress& addr) { | 98 void AsyncResolver::Start(const SocketAddress& addr) { |
99 RTC_DCHECK(construction_thread_->IsCurrent()); | |
100 RTC_DCHECK(!resolver_queue_); | |
101 // TODO(nisse): Support injection of task queue at construction? | |
102 resolver_queue_ = rtc::MakeUnique<TaskQueue>("AsyncResolverQueue"); | |
92 addr_ = addr; | 103 addr_ = addr; |
93 // SignalThred Start will kickoff the resolve process. | 104 resolver_queue_->PostTask([this](){ |
94 SignalThread::Start(); | 105 std::vector<IPAddress> addresses; |
106 int error = ResolveHostname(addr_.hostname().c_str(), addr_.family(), | |
107 &addresses); | |
108 // Ensure SignalDone is called on the main thread. | |
109 construction_thread_->Invoke<void>( | |
110 RTC_FROM_HERE, rtc::Bind(&AsyncResolver::ResolveDone, this, | |
111 error, std::move(addresses))); | |
112 }); | |
95 } | 113 } |
96 | 114 |
97 bool AsyncResolver::GetResolvedAddress(int family, SocketAddress* addr) const { | 115 bool AsyncResolver::GetResolvedAddress(int family, SocketAddress* addr) const { |
98 if (error_ != 0 || addresses_.empty()) | 116 if (error_ != 0 || addresses_.empty()) |
99 return false; | 117 return false; |
100 | 118 |
101 *addr = addr_; | 119 *addr = addr_; |
102 for (size_t i = 0; i < addresses_.size(); ++i) { | 120 for (size_t i = 0; i < addresses_.size(); ++i) { |
103 if (family == addresses_[i].family()) { | 121 if (family == addresses_[i].family()) { |
104 addr->SetResolvedIP(addresses_[i]); | 122 addr->SetResolvedIP(addresses_[i]); |
105 return true; | 123 return true; |
106 } | 124 } |
107 } | 125 } |
108 return false; | 126 return false; |
109 } | 127 } |
110 | 128 |
111 int AsyncResolver::GetError() const { | 129 int AsyncResolver::GetError() const { |
112 return error_; | 130 return error_; |
113 } | 131 } |
114 | 132 |
115 void AsyncResolver::Destroy(bool wait) { | 133 void AsyncResolver::Destroy(bool wait) { |
116 SignalThread::Destroy(wait); | 134 RTC_DCHECK(construction_thread_->IsCurrent()); |
135 // If we don't wait here, we will nevertheless wait in the destructor. | |
136 if (wait) { | |
137 // Destroy task queue, blocks on any cyrrently runnign task. | |
138 resolver_queue_.reset(); | |
139 } | |
117 } | 140 } |
118 | 141 |
119 void AsyncResolver::DoWork() { | 142 void AsyncResolver::ResolveDone(int error, std::vector<IPAddress> addresses) { |
120 error_ = ResolveHostname(addr_.hostname().c_str(), addr_.family(), | 143 RTC_DCHECK(construction_thread_->IsCurrent()); |
121 &addresses_); | 144 error_ = error; |
122 } | 145 addresses_ = std::move(addresses); |
123 | |
124 void AsyncResolver::OnWorkDone() { | |
125 SignalDone(this); | 146 SignalDone(this); |
126 } | 147 } |
127 | 148 |
128 const char* inet_ntop(int af, const void *src, char* dst, socklen_t size) { | 149 const char* inet_ntop(int af, const void *src, char* dst, socklen_t size) { |
129 #if defined(WEBRTC_WIN) | 150 #if defined(WEBRTC_WIN) |
130 return win32_inet_ntop(af, src, dst, size); | 151 return win32_inet_ntop(af, src, dst, size); |
131 #else | 152 #else |
132 return ::inet_ntop(af, src, dst, size); | 153 return ::inet_ntop(af, src, dst, size); |
133 #endif | 154 #endif |
134 } | 155 } |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
210 break; | 231 break; |
211 } | 232 } |
212 } | 233 } |
213 freeifaddrs(ifa); | 234 freeifaddrs(ifa); |
214 return has_ipv6; | 235 return has_ipv6; |
215 #else | 236 #else |
216 return true; | 237 return true; |
217 #endif | 238 #endif |
218 } | 239 } |
219 } // namespace rtc | 240 } // namespace rtc |
OLD | NEW |