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

media/cast/net/udp_transport.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/net/udp_transport.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "build/build_config.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/rand_callback.h"
 
 namespace media {
 namespace cast {
 
 namespace {
 const int kMaxPacketSize = 1500;
 
 bool IsEmpty(const net::IPEndPoint& addr) {
   net::IPAddressNumber empty_addr(addr.address().size());
-  return std::equal(
-             empty_addr.begin(), empty_addr.end(), addr.address().begin()) &&
+  return std::equal(empty_addr.begin(), empty_addr.end(),
+                    addr.address().bytes().begin()) &&
          !addr.port();
 }
 
 }  // namespace
 
 UdpTransport::UdpTransport(
     net::NetLog* net_log,
     const scoped_refptr<base::SingleThreadTaskRunner>& io_thread_proxy,
     const net::IPEndPoint& local_end_point,
     const net::IPEndPoint& remote_end_point,
@@ skipping 135 matching lines @@
     // TODO(hubbe): We should only do this if the caller used a valid ssrc.
     if (IsEmpty(remote_addr_)) {
       remote_addr_ = recv_addr_;
       VLOG(1) << "Setting remote address from first received packet: "
               << remote_addr_.ToString();
       next_packet_->resize(length_or_status);
       if (!packet_receiver_.Run(std::move(next_packet_))) {
         VLOG(1) << "Packet was not valid, resetting remote address.";
         remote_addr_ = net::IPEndPoint();
       }
     } else if (!(remote_addr_ == recv_addr_)) {

[miu, 2016/01/21 00:57:50]

Since you added the != operator, can you please change this expression to use
it?

[martijnc, 2016/01/21 21:28:57]

remote_addr_ and recv_addr_ are net::IPEndpoint instances but the new !=
operator compares net::IPAddress instances. Using it here would ignore the port
number?

[miu, 2016/01/21 23:34:31]

Ah, my mistake.  Never mind.

       VLOG(1) << "Ignoring packet received from an unrecognized address: "
               << recv_addr_.ToString() << ".";
     } else {
       next_packet_->resize(length_or_status);
       packet_receiver_.Run(std::move(next_packet_));
     }
     length_or_status = net::ERR_IO_PENDING;
   }
 }
 
@@ skipping 74 matching lines @@
   }
   ScheduleReceiveNextPacket();
 
   if (!cb.is_null()) {
     cb.Run();
   }
 }
 
 }  // namespace cast
 }  // namespace media