summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/socks_client_socket.cc2
-rw-r--r--net/socket/tcp_client_socket_libevent.cc4
-rw-r--r--net/socket/tcp_client_socket_win.cc4
-rw-r--r--net/socket/tcp_server_socket_libevent.cc2
-rw-r--r--net/socket/tcp_server_socket_win.cc2
-rw-r--r--net/socket/transport_client_socket_pool.cc8
-rw-r--r--net/socket/transport_client_socket_pool_unittest.cc36
7 files changed, 29 insertions, 29 deletions
diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc
index 2842fd1..16ef3bd 100644
--- a/net/socket/socks_client_socket.cc
+++ b/net/socket/socks_client_socket.cc
@@ -331,7 +331,7 @@ const std::string SOCKSClientSocket::BuildHandshakeWriteBuffer() const {
// TODO(eroman): we only ever use the first address in the list. It would be
// more robust to try all the IP addresses we have before
// failing the connect attempt.
- CHECK_EQ(AF_INET, endpoint.GetFamily());
+ CHECK_EQ(ADDRESS_FAMILY_IPV4, endpoint.GetFamily());
CHECK_LE(endpoint.address().size(), sizeof(request.ip));
memcpy(&request.ip, &endpoint.address()[0], endpoint.address().size());
diff --git a/net/socket/tcp_client_socket_libevent.cc b/net/socket/tcp_client_socket_libevent.cc
index 63d937c..d1de66d 100644
--- a/net/socket/tcp_client_socket_libevent.cc
+++ b/net/socket/tcp_client_socket_libevent.cc
@@ -181,7 +181,7 @@ int TCPClientSocketLibevent::Bind(const IPEndPoint& address) {
return ERR_INVALID_ARGUMENT;
// Create |bound_socket_| and try to bind it to |address|.
- int error = CreateSocket(address.GetFamily(), &bound_socket_);
+ int error = CreateSocket(address.GetSockAddrFamily(), &bound_socket_);
if (error)
return MapSystemError(error);
@@ -278,7 +278,7 @@ int TCPClientSocketLibevent::DoConnect() {
bound_socket_ = kInvalidSocket;
} else {
// Create a non-blocking socket.
- connect_os_error_ = CreateSocket(endpoint.GetFamily(), &socket_);
+ connect_os_error_ = CreateSocket(endpoint.GetSockAddrFamily(), &socket_);
if (connect_os_error_)
return MapSystemError(connect_os_error_);
diff --git a/net/socket/tcp_client_socket_win.cc b/net/socket/tcp_client_socket_win.cc
index 3639581..dc7fc08 100644
--- a/net/socket/tcp_client_socket_win.cc
+++ b/net/socket/tcp_client_socket_win.cc
@@ -383,7 +383,7 @@ int TCPClientSocketWin::Bind(const IPEndPoint& address) {
return ERR_INVALID_ARGUMENT;
// Create |bound_socket_| and try to bind it to |address|.
- int error = CreateSocket(address.GetFamily(), &bound_socket_);
+ int error = CreateSocket(address.GetSockAddrFamily(), &bound_socket_);
if (error)
return MapSystemError(error);
@@ -479,7 +479,7 @@ int TCPClientSocketWin::DoConnect() {
socket_ = bound_socket_;
bound_socket_ = INVALID_SOCKET;
} else {
- connect_os_error_ = CreateSocket(endpoint.GetFamily(), &socket_);
+ connect_os_error_ = CreateSocket(endpoint.GetSockAddrFamily(), &socket_);
if (connect_os_error_ != 0)
return MapSystemError(connect_os_error_);
diff --git a/net/socket/tcp_server_socket_libevent.cc b/net/socket/tcp_server_socket_libevent.cc
index 64f0096..589fd11 100644
--- a/net/socket/tcp_server_socket_libevent.cc
+++ b/net/socket/tcp_server_socket_libevent.cc
@@ -59,7 +59,7 @@ int TCPServerSocketLibevent::Listen(const IPEndPoint& address, int backlog) {
DCHECK_GT(backlog, 0);
DCHECK_EQ(socket_, kInvalidSocket);
- socket_ = socket(address.GetFamily(), SOCK_STREAM, IPPROTO_TCP);
+ socket_ = socket(address.GetSockAddrFamily(), SOCK_STREAM, IPPROTO_TCP);
if (socket_ < 0) {
PLOG(ERROR) << "socket() returned an error";
return MapSystemError(errno);
diff --git a/net/socket/tcp_server_socket_win.cc b/net/socket/tcp_server_socket_win.cc
index 817e73a..c834506 100644
--- a/net/socket/tcp_server_socket_win.cc
+++ b/net/socket/tcp_server_socket_win.cc
@@ -53,7 +53,7 @@ int TCPServerSocketWin::Listen(const IPEndPoint& address, int backlog) {
return ERR_FAILED;
}
- socket_ = socket(address.GetFamily(), SOCK_STREAM, IPPROTO_TCP);
+ socket_ = socket(address.GetSockAddrFamily(), SOCK_STREAM, IPPROTO_TCP);
if (socket_ < 0) {
PLOG(ERROR) << "socket() returned an error";
return MapSystemError(WSAGetLastError());
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc
index 0dd4782..bc49d98 100644
--- a/net/socket/transport_client_socket_pool.cc
+++ b/net/socket/transport_client_socket_pool.cc
@@ -38,7 +38,7 @@ bool AddressListOnlyContainsIPv6(const AddressList& list) {
DCHECK(!list.empty());
for (AddressList::const_iterator iter = list.begin(); iter != list.end();
++iter) {
- if (iter->GetFamily() != AF_INET6)
+ if (iter->GetFamily() != ADDRESS_FAMILY_IPV6)
return false;
}
return true;
@@ -116,7 +116,7 @@ LoadState TransportConnectJob::GetLoadState() const {
// static
void TransportConnectJob::MakeAddressListStartWithIPv4(AddressList* list) {
for (AddressList::iterator i = list->begin(); i != list->end(); ++i) {
- if (i->GetFamily() == AF_INET) {
+ if (i->GetFamily() == ADDRESS_FAMILY_IPV4) {
std::rotate(list->begin(), i, list->end());
break;
}
@@ -189,7 +189,7 @@ int TransportConnectJob::DoTransportConnect() {
int rv = transport_socket_->Connect(
base::Bind(&TransportConnectJob::OnIOComplete, base::Unretained(this)));
if (rv == ERR_IO_PENDING &&
- addresses_.front().GetFamily() == AF_INET6 &&
+ addresses_.front().GetFamily() == ADDRESS_FAMILY_IPV6 &&
!AddressListOnlyContainsIPv6(addresses_)) {
fallback_timer_.Start(FROM_HERE,
base::TimeDelta::FromMilliseconds(kIPv6FallbackTimerInMs),
@@ -200,7 +200,7 @@ int TransportConnectJob::DoTransportConnect() {
int TransportConnectJob::DoTransportConnectComplete(int result) {
if (result == OK) {
- bool is_ipv4 = addresses_.front().GetFamily() != AF_INET6;
+ bool is_ipv4 = addresses_.front().GetFamily() == ADDRESS_FAMILY_IPV4;
DCHECK(connect_start_time_ != base::TimeTicks());
DCHECK(start_time_ != base::TimeTicks());
base::TimeTicks now = base::TimeTicks::Now();
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc
index 12a9a7d..efeaa6e 100644
--- a/net/socket/transport_client_socket_pool_unittest.cc
+++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -71,7 +71,7 @@ class MockClientSocket : public StreamSocket {
virtual int GetLocalAddress(IPEndPoint* address) const {
if (!connected_)
return ERR_SOCKET_NOT_CONNECTED;
- if (addrlist_.front().GetFamily() == AF_INET)
+ if (addrlist_.front().GetFamily() == ADDRESS_FAMILY_IPV4)
SetIPv4Address(address);
else
SetIPv6Address(address);
@@ -222,7 +222,7 @@ class MockPendingClientSocket : public StreamSocket {
virtual int GetLocalAddress(IPEndPoint* address) const {
if (!is_connected_)
return ERR_SOCKET_NOT_CONNECTED;
- if (addrlist_.front().GetFamily() == AF_INET)
+ if (addrlist_.front().GetFamily() == ADDRESS_FAMILY_IPV4)
SetIPv4Address(address);
else
SetIPv6Address(address);
@@ -468,8 +468,8 @@ TEST(TransportConnectJobTest, MakeAddrListStartWithIPv4) {
addrlist.push_back(addrlist_v4_2);
TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
ASSERT_EQ(2u, addrlist.size());
- EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
- EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[0].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[1].GetFamily());
// Test 2: IPv6 only. Expect no change.
addrlist.clear();
@@ -477,8 +477,8 @@ TEST(TransportConnectJobTest, MakeAddrListStartWithIPv4) {
addrlist.push_back(addrlist_v6_2);
TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
ASSERT_EQ(2u, addrlist.size());
- EXPECT_EQ(AF_INET6, addrlist[0].GetFamily());
- EXPECT_EQ(AF_INET6, addrlist[1].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[0].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[1].GetFamily());
// Test 3: IPv4 then IPv6. Expect no change.
addrlist.clear();
@@ -488,10 +488,10 @@ TEST(TransportConnectJobTest, MakeAddrListStartWithIPv4) {
addrlist.push_back(addrlist_v6_2);
TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
ASSERT_EQ(4u, addrlist.size());
- EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
- EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
- EXPECT_EQ(AF_INET6, addrlist[2].GetFamily());
- EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[0].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[1].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[2].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[3].GetFamily());
// Test 4: IPv6, IPv4, IPv6, IPv4. Expect first IPv6 moved to the end.
addrlist.clear();
@@ -501,10 +501,10 @@ TEST(TransportConnectJobTest, MakeAddrListStartWithIPv4) {
addrlist.push_back(addrlist_v4_2);
TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
ASSERT_EQ(4u, addrlist.size());
- EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
- EXPECT_EQ(AF_INET6, addrlist[1].GetFamily());
- EXPECT_EQ(AF_INET, addrlist[2].GetFamily());
- EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[0].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[1].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[2].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[3].GetFamily());
// Test 5: IPv6, IPv6, IPv4, IPv4. Expect first two IPv6's moved to the end.
addrlist.clear();
@@ -514,10 +514,10 @@ TEST(TransportConnectJobTest, MakeAddrListStartWithIPv4) {
addrlist.push_back(addrlist_v4_2);
TransportConnectJob::MakeAddressListStartWithIPv4(&addrlist);
ASSERT_EQ(4u, addrlist.size());
- EXPECT_EQ(AF_INET, addrlist[0].GetFamily());
- EXPECT_EQ(AF_INET, addrlist[1].GetFamily());
- EXPECT_EQ(AF_INET6, addrlist[2].GetFamily());
- EXPECT_EQ(AF_INET6, addrlist[3].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[0].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV4, addrlist[1].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[2].GetFamily());
+ EXPECT_EQ(ADDRESS_FAMILY_IPV6, addrlist[3].GetFamily());
}
TEST_F(TransportClientSocketPoolTest, Basic) {
generated by cgit v1.1 at 2025-02-19 18:17:24 +0000