diff options
| author | eroman <eroman@chromium.org> | 2016-03-16 20:23:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 03:28:04 +0000 |
| commit | 36d84e54432fcdb48ac3903ad2ba4aa9d68ccca0 (patch) | |
| tree | d0ad9fcf0819d7ca4407566ed4b56b2b352b74f0 /net/tools/quic | |
| parent | c847e222ae0f59ace649e08c6aac001e18c37be1 (diff) | |
| download | chromium_src-36d84e54432fcdb48ac3903ad2ba4aa9d68ccca0.zip chromium_src-36d84e54432fcdb48ac3903ad2ba4aa9d68ccca0.tar.gz chromium_src-36d84e54432fcdb48ac3903ad2ba4aa9d68ccca0.tar.bz2 | |
Update some callers to use more direct ways of constructing IPAddress from well known literals.
BUG=496258
Review URL: https://codereview.chromium.org/1809863002
Cr-Commit-Position: refs/heads/master@{#381655}
Diffstat (limited to 'net/tools/quic')
| -rw-r--r-- | net/tools/quic/end_to_end_test.cc | 7 | ||||
| -rw-r--r-- | net/tools/quic/quic_client.cc | 5 | ||||
| -rw-r--r-- | net/tools/quic/quic_server_bin.cc | 3 | ||||
| -rw-r--r-- | net/tools/quic/quic_simple_client.cc | 6 | ||||
| -rw-r--r-- | net/tools/quic/quic_simple_server_bin.cc | 3 |
5 files changed, 9 insertions, 15 deletions
diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc index 441a5d9..923808b 100644 --- a/net/tools/quic/end_to_end_test.cc +++ b/net/tools/quic/end_to_end_test.cc @@ -547,12 +547,11 @@ TEST_P(EndToEndTest, SimpleRequestResponseWithLargeReject) { EXPECT_EQ(3, client_->client()->GetNumSentClientHellos()); } -// TODO(rch): figure out how to detect missing v6 supprt (like on the linux +// TODO(rch): figure out how to detect missing v6 support (like on the linux // try bots) and selectively disable this test. TEST_P(EndToEndTest, DISABLED_SimpleRequestResponsev6) { - IPAddress ip; - CHECK(ip.AssignFromIPLiteral("::1")); - server_address_ = IPEndPoint(ip, server_address_.port()); + server_address_ = + IPEndPoint(IPAddress::IPv6Localhost(), server_address_.port()); ASSERT_TRUE(Initialize()); EXPECT_EQ(kFooResponseBody, client_->SendSynchronousRequest("/foo")); diff --git a/net/tools/quic/quic_client.cc b/net/tools/quic/quic_client.cc index 04b7d2f..8f9da4f 100644 --- a/net/tools/quic/quic_client.cc +++ b/net/tools/quic/quic_client.cc @@ -149,10 +149,9 @@ bool QuicClient::CreateUDPSocketAndBind() { if (bind_to_address_.size() != 0) { client_address = IPEndPoint(bind_to_address_, local_port_); } else if (server_address_.GetSockAddrFamily() == AF_INET) { - client_address = IPEndPoint(IPAddress(0, 0, 0, 0), local_port_); + client_address = IPEndPoint(IPAddress::IPv4AllZeros(), local_port_); } else { - IPAddress any6; - CHECK(any6.AssignFromIPLiteral("::")); + IPAddress any6 = IPAddress::IPv6AllZeros(); client_address = IPEndPoint(any6, local_port_); } diff --git a/net/tools/quic/quic_server_bin.cc b/net/tools/quic/quic_server_bin.cc index a6a3341..983c584 100644 --- a/net/tools/quic/quic_server_bin.cc +++ b/net/tools/quic/quic_server_bin.cc @@ -77,8 +77,7 @@ int main(int argc, char* argv[]) { return 1; } - net::IPAddress ip; - CHECK(ip.AssignFromIPLiteral("::")); + auto ip = net::IPAddress::IPv6AllZeros(); net::QuicConfig config; net::QuicServer server( diff --git a/net/tools/quic/quic_simple_client.cc b/net/tools/quic/quic_simple_client.cc index 4c2b221..b1dcf19 100644 --- a/net/tools/quic/quic_simple_client.cc +++ b/net/tools/quic/quic_simple_client.cc @@ -107,11 +107,9 @@ bool QuicSimpleClient::CreateUDPSocket() { if (bind_to_address_.size() != 0) { client_address_ = IPEndPoint(bind_to_address_, local_port_); } else if (address_family == AF_INET) { - client_address_ = IPEndPoint(IPAddress(0, 0, 0, 0), local_port_); + client_address_ = IPEndPoint(IPAddress::IPv4AllZeros(), local_port_); } else { - IPAddress any6; - CHECK(any6.AssignFromIPLiteral("::")); - client_address_ = IPEndPoint(any6, local_port_); + client_address_ = IPEndPoint(IPAddress::IPv6AllZeros(), local_port_); } int rc = socket->Connect(server_address_); diff --git a/net/tools/quic/quic_simple_server_bin.cc b/net/tools/quic/quic_simple_server_bin.cc index b92a926..b04bf15 100644 --- a/net/tools/quic/quic_simple_server_bin.cc +++ b/net/tools/quic/quic_simple_server_bin.cc @@ -77,8 +77,7 @@ int main(int argc, char* argv[]) { return 1; } - net::IPAddress ip; - CHECK(ip.AssignFromIPLiteral("::")); + net::IPAddress ip = net::IPAddress::IPv6AllZeros(); net::QuicConfig config; net::QuicSimpleServer server( |