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

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 for ChromeOS 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
« no previous file with comments | « net/quic/quic_address_mismatch.cc ('k') | net/quic/quic_connection_logger.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_connection.cc
diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
index 79f0d5d25ecda3306082fc2ba7ce71c50e2f3ea0..4374e3d7aa0abef6d2c13e0cbf9fed9f982a503d 100644
--- a/net/quic/quic_connection.cc
+++ b/net/quic/quic_connection.cc
@@ -1112,7 +1112,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);
@@ -1300,7 +1300,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();
}
@@ -1429,7 +1429,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 "
@@ -1648,7 +1648,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);
}
« no previous file with comments | « net/quic/quic_address_mismatch.cc ('k') | net/quic/quic_connection_logger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698