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 #ifndef WEBRTC_BASE_NETHELPERS_H_ | 11 #ifndef WEBRTC_BASE_NETHELPERS_H_ |
12 #define WEBRTC_BASE_NETHELPERS_H_ | 12 #define WEBRTC_BASE_NETHELPERS_H_ |
13 | 13 |
14 #if defined(WEBRTC_POSIX) | 14 #if defined(WEBRTC_POSIX) |
15 #include <netdb.h> | 15 #include <netdb.h> |
16 #include <stddef.h> | 16 #include <stddef.h> |
17 #elif WEBRTC_WIN | 17 #elif WEBRTC_WIN |
18 #include <winsock2.h> // NOLINT | 18 #include <winsock2.h> // NOLINT |
19 #endif | 19 #endif |
20 | 20 |
21 #include <list> | 21 #include <list> |
22 | 22 |
23 #include "webrtc/base/asyncresolverinterface.h" | 23 #include "webrtc/base/asyncresolverinterface.h" |
24 #include "webrtc/base/signalthread.h" | 24 #include "webrtc/base/platform_thread.h" |
25 #include "webrtc/base/sigslot.h" | 25 #include "webrtc/base/sigslot.h" |
26 #include "webrtc/base/socketaddress.h" | 26 #include "webrtc/base/socketaddress.h" |
27 | 27 |
28 namespace rtc { | 28 namespace rtc { |
29 | 29 |
30 class AsyncResolverTest; | 30 class Thread; |
31 | 31 |
32 // AsyncResolver will perform async DNS resolution, signaling the result on | 32 // AsyncResolver will perform async DNS resolution, signaling the result on |
33 // the SignalDone from AsyncResolverInterface when the operation completes. | 33 // the SignalDone from AsyncResolverInterface when the operation completes. |
Taylor Brandstetter
2017/06/05 22:33:25
nit: Could you add a comment saying that SignalDon
nisse-webrtc
2017/06/07 07:17:31
Done. But maybe that comment belongs with the Asyn
Taylor Brandstetter
2017/06/09 02:50:13
The comment applies to this class's constructor sp
| |
34 class AsyncResolver : public SignalThread, public AsyncResolverInterface { | 34 class AsyncResolver : public AsyncResolverInterface { |
35 public: | 35 public: |
36 AsyncResolver(); | 36 AsyncResolver(); |
37 ~AsyncResolver() override; | 37 ~AsyncResolver() override; |
38 | 38 |
39 void Start(const SocketAddress& addr) override; | 39 void Start(const SocketAddress& addr) override; |
40 bool GetResolvedAddress(int family, SocketAddress* addr) const override; | 40 bool GetResolvedAddress(int family, SocketAddress* addr) const override; |
41 int GetError() const override; | 41 int GetError() const override; |
42 void Destroy(bool wait) override; | 42 void Destroy(bool wait) override; |
43 | 43 |
44 const std::vector<IPAddress>& addresses() const { return addresses_; } | 44 const std::vector<IPAddress>& addresses() const { return addresses_; } |
45 void set_error(int error) { error_ = error; } | 45 void set_error(int error) { error_ = error; } |
46 | 46 |
47 protected: | 47 private: |
48 void DoWork() override; | 48 // Thread main function |
Taylor Brandstetter
2017/06/05 22:33:25
nit: Period?
| |
49 void OnWorkDone() override; | 49 static void ThreadEntry(void *p); |
tommi
2017/06/08 08:02:10
void* p
(or even |param|)
can you run git cl form
nisse-webrtc
2017/06/08 09:52:33
Done.
| |
50 void DoWork(); | |
tommi
2017/06/08 08:02:10
can we have slightly more descriptive names for th
| |
51 void OnWorkDone(); | |
50 | 52 |
51 private: | 53 rtc::Thread* main_; |
tommi
2017/06/08 08:02:10
nit: I'd prefer |thread_| to |main_|. Actually...
| |
54 rtc::CriticalSection lock_; | |
nisse-webrtc
2017/06/02 08:41:04
The use of this lock is maybe overly conservative.
Taylor Brandstetter
2017/06/05 22:33:25
It should be enough. Can you try removing the lock
nisse-webrtc
2017/06/07 07:17:31
Done.
| |
55 PlatformThread worker_; | |
52 SocketAddress addr_; | 56 SocketAddress addr_; |
53 std::vector<IPAddress> addresses_; | 57 std::vector<IPAddress> addresses_; |
54 int error_; | 58 int error_; |
55 }; | 59 }; |
56 | 60 |
57 // rtc namespaced wrappers for inet_ntop and inet_pton so we can avoid | 61 // rtc namespaced wrappers for inet_ntop and inet_pton so we can avoid |
58 // the windows-native versions of these. | 62 // the windows-native versions of these. |
59 const char* inet_ntop(int af, const void *src, char* dst, socklen_t size); | 63 const char* inet_ntop(int af, const void *src, char* dst, socklen_t size); |
60 int inet_pton(int af, const char* src, void *dst); | 64 int inet_pton(int af, const char* src, void *dst); |
61 | 65 |
62 bool HasIPv4Enabled(); | 66 bool HasIPv4Enabled(); |
63 bool HasIPv6Enabled(); | 67 bool HasIPv6Enabled(); |
64 } // namespace rtc | 68 } // namespace rtc |
65 | 69 |
66 #endif // WEBRTC_BASE_NETHELPERS_H_ | 70 #endif // WEBRTC_BASE_NETHELPERS_H_ |
OLD | NEW |