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

Unified Diff: net/base/network_interfaces_win.cc

Issue 1565303002: Change IPEndpoint::address() to return a net::IPAddress (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feedback eroman 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
Index: net/base/network_interfaces_win.cc
diff --git a/net/base/network_interfaces_win.cc b/net/base/network_interfaces_win.cc
index e451211161e6868510ecc19c85ac9ec6d836a16e..ac793913519cf65be5d3c7d225a1be95e6fd1217 100644
--- a/net/base/network_interfaces_win.cc
+++ b/net/base/network_interfaces_win.cc
@@ -180,10 +180,11 @@ bool GetNetworkListImpl(NetworkInterfaceList* networks,
int prefix_family = prefix->Address.lpSockaddr->sa_family;
IPEndPoint network_endpoint;
if (prefix_family == family &&
- network_endpoint.FromSockAddr(prefix->Address.lpSockaddr,
+ network_endpoint.FromSockAddr(
+ prefix->Address.lpSockaddr,
prefix->Address.iSockaddrLength) &&
- IPNumberMatchesPrefix(endpoint.address(),
- network_endpoint.address(),
+ IPNumberMatchesPrefix(endpoint.address().bytes(),
+ network_endpoint.address().bytes(),
prefix->PrefixLength)) {
prefix_length =
std::max<size_t>(prefix_length, prefix->PrefixLength);
@@ -214,11 +215,12 @@ bool GetNetworkListImpl(NetworkInterfaceList* networks,
ip_address_attributes |= IP_ADDRESS_ATTRIBUTE_DEPRECATED;
}
}
- networks->push_back(NetworkInterface(
- adapter->AdapterName,
- base::SysWideToNativeMB(adapter->FriendlyName), index,
- GetNetworkInterfaceType(adapter->IfType), endpoint.address(),
- prefix_length, ip_address_attributes));
+ networks->push_back(
+ NetworkInterface(adapter->AdapterName,
+ base::SysWideToNativeMB(adapter->FriendlyName),
+ index, GetNetworkInterfaceType(adapter->IfType),
+ endpoint.address().bytes(), prefix_length,
+ ip_address_attributes));
}
}
}

Powered by Google App Engine
This is Rietveld 408576698