Change IPEndpoint::address() to return a net::IPAddress

net/quic/quic_connection.cc

Index: net/quic/quic_connection.cc
diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
index 6eabc9d8c4b5d9da2df269fbc6b448a3c49672e0..641879b7152673f74446991dd3327f954af20cfc 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);
@@ -1262,16 +1262,18 @@ void QuicConnection::CheckForAddressMigration(const IPEndPoint& self_address,
   }
 
   if (!peer_address.address().empty() && !peer_address_.address().empty()) {
-    peer_ip_changed_ = (peer_address.address() != peer_address_.address());
+    peer_ip_changed_ =
+        (peer_address.address().bytes() != peer_address_.address().bytes());

[eroman, 2016/01/13 23:19:42]

note that IPAddress already defines operator==. I suggest adding operator!= and
then no changes needed here.

[martijnc, 2016/01/14 22:48:17]

Done.

     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();
   }
 
   if (!self_address.address().empty() && !self_address_.address().empty()) {
-    self_ip_changed_ = (self_address.address() != self_address_.address());
+    self_ip_changed_ =
+        (self_address.address().bytes() != self_address_.address().bytes());
     self_port_changed_ = (self_address.port() != self_address_.port());
   }
 
@@ -1395,7 +1397,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 +1617,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);
   }