Chromium Code Reviews| Index: net/base/net_util.h |
| diff --git a/net/base/net_util.h b/net/base/net_util.h |
| index 39cb6abdc9caef02a5b3b3532d5efddeb4d1df33..421df4addd45f1a008ee874105030da6ac502d81 100644 |
| --- a/net/base/net_util.h |
| +++ b/net/base/net_util.h |
| @@ -438,16 +438,35 @@ NET_EXPORT_PRIVATE int GetPortFromSockaddr(const struct sockaddr* address, |
| // machine. |
| NET_EXPORT_PRIVATE bool IsLocalhost(const std::string& host); |
| +// A subset of IP address attributes which are actionable by |
|
pauljensen
2014/09/19 14:56:53
by->by the
(I recommended this in my last review)
guoweis2
2014/09/19 16:55:30
Sorry, missed the. Done.
|
| +// application layer. Currently unimplemented for all hosts; |
| +// IP_ADDRESS_ATTRIBUTE_NONE is always returned. |
| +enum IPAddressAttributes { |
| + IP_ADDRESS_ATTRIBUTE_NONE = 0, |
| + |
| + // Temporary address is dynamic by nature and will not carry MAC |
|
pauljensen
2014/09/19 14:56:53
carry -> contain
Could we mention this is for IPv6
guoweis2
2014/09/19 16:55:30
Done.
|
| + // address. |
| + IP_ADDRESS_ATTRIBUTE_TEMPORARY = 1 << 0, |
| + |
| + // Temporary address could become deprecated once the preferred |
|
pauljensen
2014/09/19 14:56:53
Either "Temporary" -> "A temporary"
or "address co
guoweis2
2014/09/19 16:55:30
Done.
|
| + // lifetime is reached. It is still valid but shouldn't be used to |
| + // create new connection. |
|
pauljensen
2014/09/19 14:56:53
connection -> connections
guoweis2
2014/09/19 16:55:30
Done.
|
| + IP_ADDRESS_ATTRIBUTE_DEPRECATED = 1 << 1, |
| +}; |
| + |
| // struct that is used by GetNetworkList() to represent a network |
| // interface. |
| struct NET_EXPORT NetworkInterface { |
| NetworkInterface(); |
| + |
|
pauljensen
2014/09/19 14:56:53
needless whitespace change
guoweis2
2014/09/19 16:55:30
Done. Also removed one before ~NetworkInterface()
|
| NetworkInterface(const std::string& name, |
| const std::string& friendly_name, |
| uint32 interface_index, |
| NetworkChangeNotifier::ConnectionType type, |
| const IPAddressNumber& address, |
| - uint32 network_prefix); |
| + uint32 network_prefix, |
| + int ip_address_attributes); |
| + |
| ~NetworkInterface(); |
| std::string name; |
| @@ -456,6 +475,7 @@ struct NET_EXPORT NetworkInterface { |
| NetworkChangeNotifier::ConnectionType type; |
| IPAddressNumber address; |
| uint32 network_prefix; |
| + int ip_address_attributes; // Combination of |IPAddressAttributes|. |
| }; |
| typedef std::vector<NetworkInterface> NetworkInterfaceList; |