| Index: net/base/net_util.h
|
| diff --git a/net/base/net_util.h b/net/base/net_util.h
|
| index 04a9b2dfbe918d7763703e763f0ca1dc607f2c48..fb42cf2d907635972d360e20968e89bac7b1fd4f 100644
|
| --- a/net/base/net_util.h
|
| +++ b/net/base/net_util.h
|
| @@ -530,10 +530,13 @@ struct NET_EXPORT NetworkInterface {
|
|
|
| typedef std::vector<NetworkInterface> NetworkInterfaceList;
|
|
|
| -// Policy settings to include/exclude VMWare host only network interfaces.
|
| -enum HostScopeVirtualInterfacePolicy {
|
| - INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES,
|
| - EXCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES,
|
| +// Policy settings to include/exclude network interfaces.
|
| +enum HostAddressSelectionPolicy {
|
| + EXCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES = 0x0,
|
| + INCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES = 0x1,
|
| + // Include temp address only when interface has both permanent and
|
| + // temp addresses.
|
| + INCLUDE_ONLY_TEMP_IPV6_ADDRESS_IF_POSSIBLE = 0x2,
|
| };
|
|
|
| // Returns list of network interfaces except loopback interface. If an
|
| @@ -541,7 +544,7 @@ enum HostScopeVirtualInterfacePolicy {
|
| // the list for each address.
|
| // Can be called only on a thread that allows IO.
|
| NET_EXPORT bool GetNetworkList(NetworkInterfaceList* networks,
|
| - HostScopeVirtualInterfacePolicy policy);
|
| + int policy);
|
|
|
| // General category of the IEEE 802.11 (wifi) physical layer operating mode.
|
| enum WifiPHYLayerProtocol {
|
|
|