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

net/base/ip_endpoint.cc

 // Copyright (c) 2012 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 "net/base/ip_endpoint.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <winsock2.h>
@@ skipping 71 matching lines @@
 
 IPEndPoint::IPEndPoint() : port_(0) {}
 
 IPEndPoint::~IPEndPoint() {}
 
 IPEndPoint::IPEndPoint(const IPAddressNumber& address, uint16_t port)
     : address_(address), port_(port) {
 }
 
 IPEndPoint::IPEndPoint(const IPAddress& address, uint16_t port)
-    : address_(address.bytes()), port_(port) {
-}
+    : address_(address), port_(port) {}
 
 IPEndPoint::IPEndPoint(const IPEndPoint& endpoint) {
   address_ = endpoint.address_;
   port_ = endpoint.port_;
 }
 
 AddressFamily IPEndPoint::GetFamily() const {
-  return GetAddressFamily(address_);
+  return GetAddressFamily(address_.bytes());
 }
 
 int IPEndPoint::GetSockAddrFamily() const {
   switch (address_.size()) {
     case kIPv4AddressSize:
       return AF_INET;
     case kIPv6AddressSize:
       return AF_INET6;
     default:
       NOTREACHED() << "Bad IP address";
       return AF_UNSPEC;
   }
 }
 
 bool IPEndPoint::ToSockAddr(struct sockaddr* address,
                             socklen_t* address_length) const {
   DCHECK(address);
   DCHECK(address_length);
   switch (address_.size()) {
     case kIPv4AddressSize: {
       if (*address_length < kSockaddrInSize)
         return false;
       *address_length = kSockaddrInSize;
       struct sockaddr_in* addr = reinterpret_cast<struct sockaddr_in*>(address);
       memset(addr, 0, sizeof(struct sockaddr_in));
       addr->sin_family = AF_INET;
       addr->sin_port = base::HostToNet16(port_);
-      memcpy(&addr->sin_addr, &address_[0], kIPv4AddressSize);
+      memcpy(&addr->sin_addr, &address_.bytes()[0], kIPv4AddressSize);
       break;
     }
     case kIPv6AddressSize: {
       if (*address_length < kSockaddrIn6Size)
         return false;
       *address_length = kSockaddrIn6Size;
       struct sockaddr_in6* addr6 =
           reinterpret_cast<struct sockaddr_in6*>(address);
       memset(addr6, 0, sizeof(struct sockaddr_in6));
       addr6->sin6_family = AF_INET6;
       addr6->sin6_port = base::HostToNet16(port_);
-      memcpy(&addr6->sin6_addr, &address_[0], kIPv6AddressSize);
+      memcpy(&addr6->sin6_addr, &address_.bytes()[0], kIPv6AddressSize);
       break;
     }
     default:
       return false;
   }
   return true;
 }
 
 bool IPEndPoint::FromSockAddr(const struct sockaddr* sock_addr,
                               socklen_t sock_addr_len) {
   DCHECK(sock_addr);
 
   const uint8_t* address;
   size_t address_len;
   uint16_t port;
   if (!GetIPAddressFromSockAddr(sock_addr, sock_addr_len, &address,
                                 &address_len, &port)) {
     return false;
   }
 
-  address_.assign(address, address + address_len);
+  std::vector<uint8_t> ip_address(address, address + address_len);
+  address_ = net::IPAddress(ip_address);

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

There is already a constructor for this:
   address_ = net::IPAddress(address, address_len);

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

Done.

   port_ = port;
   return true;
 }
 
 std::string IPEndPoint::ToString() const {
-  return IPAddressToStringWithPort(address_, port_);
+  return IPAddressToStringWithPort(address_.bytes(), port_);

[martijnc, 2016/01/13 22:49:31]

Would it be a good idea to add a IPAddress::ToStringWithPort(), that (for now)
would just forward the call to IPAddressToStringWithPort() (in a different CL)?

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

Is the pattern used in several other places? If it is just here I wouldn't worry
about it.

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

No, limited usage. I'll skip this.

 }
 
 std::string IPEndPoint::ToStringWithoutPort() const {
-  return IPAddressToString(address_);
+  return address_.ToString();
 }
 
 bool IPEndPoint::operator<(const IPEndPoint& other) const {
   // Sort IPv4 before IPv6.
   if (address_.size() != other.address_.size()) {
     return address_.size() < other.address_.size();
   }
   return std::tie(address_, port_) < std::tie(other.address_, other.port_);
 }
 
 bool IPEndPoint::operator==(const IPEndPoint& other) const {
   return address_ == other.address_ && port_ == other.port_;
 }
 
 }  // namespace net