Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(399)

Unified Diff: net/quic/quic_connection.cc

Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/quic/quic_connection.cc
diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
index df2efe48f22a009f9262f154b8584d03d9840122..b36ea231d249318ca2715f30ce616ed8b1e8430b 100644
--- a/net/quic/quic_connection.cc
+++ b/net/quic/quic_connection.cc
@@ -1085,7 +1085,7 @@ void QuicConnection::SendVersionNegotiationPacket() {
framer_.supported_versions()));
WriteResult result =
writer_->WritePacket(version_packet->data(), version_packet->length(),
- self_address().address(), peer_address());
+ self_address().address().bytes(), peer_address());
if (result.status == WRITE_STATUS_ERROR) {
OnWriteError(result.error_code);
@@ -1266,7 +1266,7 @@ void QuicConnection::CheckForAddressMigration(const IPEndPoint& self_address,
peer_port_changed_ = (peer_address.port() != peer_address_.port());
// Store in case we want to migrate connection in ProcessValidatedPacket.
- migrating_peer_ip_ = peer_address.address();
+ migrating_peer_ip_ = peer_address.address().bytes();
migrating_peer_port_ = peer_address.port();
}
@@ -1395,7 +1395,7 @@ bool QuicConnection::ProcessValidatedPacket(const QuicPacketHeader& header) {
if (peer_ip_changed_ || peer_port_changed_) {
IPEndPoint old_peer_address = peer_address_;
peer_address_ = IPEndPoint(
- peer_ip_changed_ ? migrating_peer_ip_ : peer_address_.address(),
+ peer_ip_changed_ ? migrating_peer_ip_ : peer_address_.address().bytes(),
peer_port_changed_ ? migrating_peer_port_ : peer_address_.port());
DVLOG(1) << ENDPOINT << "Peer's ip:port changed from "
@@ -1615,7 +1615,7 @@ bool QuicConnection::WritePacketInner(SerializedPacket* packet) {
QuicTime packet_send_time = clock_->Now();
WriteResult result =
writer_->WritePacket(encrypted->data(), encrypted->length(),
- self_address().address(), peer_address());
+ self_address().address().bytes(), peer_address());
if (result.error_code == ERR_IO_PENDING) {
DCHECK_EQ(WRITE_STATUS_BLOCKED, result.status);
}

Powered by Google App Engine
This is Rietveld 408576698