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

Unified Diff: net/base/ip_endpoint.cc

Issue 1932363003: Remove net::IPAddressNumber. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/base/ip_endpoint.h ('k') | net/cert/x509_certificate_ios.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/ip_endpoint.cc
diff --git a/net/base/ip_endpoint.cc b/net/base/ip_endpoint.cc
index 150093c00ad68fe9d81d5eeead7c9a34e8d194e0..e24a5d6f4cc1c33fec9fc2547d2201e0301d8a45 100644
--- a/net/base/ip_endpoint.cc
+++ b/net/base/ip_endpoint.cc
@@ -44,7 +44,7 @@ bool GetIPAddressFromSockAddr(const struct sockaddr* sock_addr,
const struct sockaddr_in* addr =
reinterpret_cast<const struct sockaddr_in*>(sock_addr);
*address = reinterpret_cast<const uint8_t*>(&addr->sin_addr);
- *address_len = kIPv4AddressSize;
+ *address_len = IPAddress::kIPv4AddressSize;
if (port)
*port = base::NetToHost16(addr->sin_port);
return true;
@@ -56,7 +56,7 @@ bool GetIPAddressFromSockAddr(const struct sockaddr* sock_addr,
const struct sockaddr_in6* addr =
reinterpret_cast<const struct sockaddr_in6*>(sock_addr);
*address = reinterpret_cast<const uint8_t*>(&addr->sin6_addr);
- *address_len = kIPv6AddressSize;
+ *address_len = IPAddress::kIPv6AddressSize;
if (port)
*port = base::NetToHost16(addr->sin6_port);
return true;
@@ -84,10 +84,6 @@ 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), port_(port) {}
@@ -102,9 +98,9 @@ AddressFamily IPEndPoint::GetFamily() const {
int IPEndPoint::GetSockAddrFamily() const {
switch (address_.size()) {
- case kIPv4AddressSize:
+ case IPAddress::kIPv4AddressSize:
return AF_INET;
- case kIPv6AddressSize:
+ case IPAddress::kIPv6AddressSize:
return AF_INET6;
default:
NOTREACHED() << "Bad IP address";
@@ -117,7 +113,7 @@ bool IPEndPoint::ToSockAddr(struct sockaddr* address,
DCHECK(address);
DCHECK(address_length);
switch (address_.size()) {
- case kIPv4AddressSize: {
+ case IPAddress::kIPv4AddressSize: {
if (*address_length < kSockaddrInSize)
return false;
*address_length = kSockaddrInSize;
@@ -125,10 +121,11 @@ bool IPEndPoint::ToSockAddr(struct sockaddr* address,
memset(addr, 0, sizeof(struct sockaddr_in));
addr->sin_family = AF_INET;
addr->sin_port = base::HostToNet16(port_);
- memcpy(&addr->sin_addr, &address_.bytes()[0], kIPv4AddressSize);
+ memcpy(&addr->sin_addr, address_.bytes().data(),
+ IPAddress::kIPv4AddressSize);
break;
}
- case kIPv6AddressSize: {
+ case IPAddress::kIPv6AddressSize: {
if (*address_length < kSockaddrIn6Size)
return false;
*address_length = kSockaddrIn6Size;
@@ -137,7 +134,8 @@ bool IPEndPoint::ToSockAddr(struct sockaddr* address,
memset(addr6, 0, sizeof(struct sockaddr_in6));
addr6->sin6_family = AF_INET6;
addr6->sin6_port = base::HostToNet16(port_);
- memcpy(&addr6->sin6_addr, &address_.bytes()[0], kIPv6AddressSize);
+ memcpy(&addr6->sin6_addr, address_.bytes().data(),
+ IPAddress::kIPv6AddressSize);
break;
}
default:
« no previous file with comments | « net/base/ip_endpoint.h ('k') | net/cert/x509_certificate_ios.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698