Added NetworkInterface::network_prefix

net/base/net_util.h

 // 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.
 
 #ifndef NET_BASE_NET_UTIL_H_
 #define NET_BASE_NET_UTIL_H_
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
@@ skipping 496 matching lines @@
 // Returns true if |host| is one of the names (e.g. "localhost") or IP
 // addresses (IPv4 127.0.0.0/8 or IPv6 ::1) that indicate a loopback.
 //
 // Note that this function does not check for IP addresses other than
 // the above, although other IP addresses may point to the local
 // machine.
 NET_EXPORT_PRIVATE bool IsLocalhost(const std::string& host);
 
 // struct that is used by GetNetworkList() to represent a network
 // interface.
+
+#if defined(OS_ANDROID)
+
 struct NET_EXPORT NetworkInterface {
   NetworkInterface();
-  NetworkInterface(const std::string& name, const IPAddressNumber& address);
+  NetworkInterface(const std::string& name,
+                   const IPAddressNumber& address);
   ~NetworkInterface();
 
   std::string name;
   IPAddressNumber address;
+  // network_prefix on Android is not easily accessible.

[szym, 2013/09/19 23:21:01]

Why not? This is easily done with ioctl SIOCGIFNETMASK.

[szym, 2013/09/20 19:30:15]

While the ioctl is forbidden (because it would bypass the INTERNET permission),
I think we should update AndroidNetworkLibrary.getNetworkList to include network
prefix.

This just means using NetworkInterface.getInterfaceAddresses instead of
getInetAddresses.

I understand you don't currently need it on Android, but I don't think it's that
much more work.

 };
 
+#else  // OS_ANDROID
+
+struct NET_EXPORT NetworkInterface {
+  NetworkInterface();
+  NetworkInterface(const std::string& name,
+                   const IPAddressNumber& address,
+                   uint8 network_prefix);
+  ~NetworkInterface();
+
+  std::string name;
+  IPAddressNumber address;
+  uint8 network_prefix;
+};
+
+#endif  // OS_ANDROID
+
 typedef std::vector<NetworkInterface> NetworkInterfaceList;
 
 // Returns list of network interfaces except loopback interface. If an
 // interface has more than one address, a separate entry is added to
 // the list for each address.
 // Can be called only on a thread that allows IO.
 NET_EXPORT bool GetNetworkList(NetworkInterfaceList* networks);
 
 // General category of the IEEE 802.11 (wifi) physical layer operating mode.
 enum WifiPHYLayerProtocol {
@@ skipping 10 matching lines @@
   // 802.11n, HT rates.
   WIFI_PHY_LAYER_PROTOCOL_N,
   // Unclassified mode or failure to identify.
   WIFI_PHY_LAYER_PROTOCOL_UNKNOWN
 };
 
 // Characterize the PHY mode of the currently associated access point.
 // Currently only available on OS_WIN.
 NET_EXPORT WifiPHYLayerProtocol GetWifiPHYLayerProtocol();
 
+// Returns number of matching initial bits between the addresses |a1| and |a2|.
+unsigned CommonPrefixLength(const IPAddressNumber& a1,
+                            const IPAddressNumber& a2);
+
+// Computes the number of leading 1-bits in |mask|.
+unsigned MaskPrefixLength(const IPAddressNumber& mask);
+
 }  // namespace net
 
 #endif  // NET_BASE_NET_UTIL_H_