Index: webrtc/base/socket_unittest.h |
diff --git a/webrtc/base/socket_unittest.h b/webrtc/base/socket_unittest.h |
index d368afb3f53e2d8516ed58708f17b02e51201aa6..e4a6b327059d8098476356b717870145cfb93db9 100644 |
--- a/webrtc/base/socket_unittest.h |
+++ b/webrtc/base/socket_unittest.h |
@@ -21,8 +21,9 @@ namespace rtc { |
// socketserver, and call the SocketTest test methods. |
class SocketTest : public testing::Test { |
protected: |
- SocketTest() : ss_(NULL), kIPv4Loopback(INADDR_LOOPBACK), |
- kIPv6Loopback(in6addr_loopback) {} |
+ SocketTest() : kIPv4Loopback(INADDR_LOOPBACK), |
+ kIPv6Loopback(in6addr_loopback), |
+ ss_(nullptr) {} |
virtual void SetUp() { ss_ = Thread::Current()->socketserver(); } |
void TestConnectIPv4(); |
void TestConnectIPv6(); |
@@ -57,6 +58,10 @@ class SocketTest : public testing::Test { |
void TestGetSetOptionsIPv4(); |
void TestGetSetOptionsIPv6(); |
+ static const int kTimeout = 5000; // ms |
+ const IPAddress kIPv4Loopback; |
+ const IPAddress kIPv6Loopback; |
+ |
private: |
void ConnectInternal(const IPAddress& loopback); |
void ConnectWithDnsLookupInternal(const IPAddress& loopback, |
@@ -77,12 +82,13 @@ class SocketTest : public testing::Test { |
void UdpReadyToSend(const IPAddress& loopback); |
void GetSetOptionsInternal(const IPAddress& loopback); |
- static const int kTimeout = 5000; // ms |
SocketServer* ss_; |
- const IPAddress kIPv4Loopback; |
- const IPAddress kIPv6Loopback; |
}; |
+// For unbound sockets, GetLocalAddress / GetRemoteAddress return AF_UNSPEC |
+// values on Windows, but an empty address of the same family on Linux/MacOS X. |
+bool IsUnspecOrEmptyIP(const IPAddress& address); |
+ |
} // namespace rtc |
#endif // WEBRTC_BASE_SOCKET_UNITTEST_H_ |