Added NetworkInterface::network_prefix

net/base/net_util_posix.cc

 // Copyright (c) 2011 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.
 
 #include "net/base/net_util.h"
 
 #include <sys/types.h>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/escape.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "url/gurl.h"
 
 #if !defined(OS_ANDROID)
 #include <ifaddrs.h>
@@ skipping 40 matching lines @@
 
   return !file_path_str.empty();
 }
 
 bool GetNetworkList(NetworkInterfaceList* networks) {
 #if defined(OS_ANDROID)
   std::string network_list = android::GetNetworkList();
   base::StringTokenizer network_interfaces(network_list, ";");
   while (network_interfaces.GetNext()) {
     std::string network_item = network_interfaces.token();
-    base::StringTokenizer network_tokenizer(network_item, ",");
+    base::StringTokenizer network_tokenizer(network_item, "/");
     std::string name;
-    if (!network_tokenizer.GetNext())
-      continue;
+    CHECK(network_tokenizer.GetNext());
     name = network_tokenizer.token();
 
     std::string literal_address;
-    if (!network_tokenizer.GetNext())
-      continue;
+    CHECK(network_tokenizer.GetNext());
     literal_address = network_tokenizer.token();
 
+    std::string network_prefix;
+    CHECK(network_tokenizer.GetNext());
+    network_prefix = network_tokenizer.token();
+
+    unsigned net_mask = 0;
+    CHECK(base::StringToUint(network_tokenizer.token(), &net_mask));
+    CHECK(net_mask <= 255);

[szym, 2013/09/23 19:58:42]

CHECK_LE

[Vitaly Buka (NO REVIEWS), 2013/09/23 20:06:11]

Done.

+
     IPAddressNumber address;
-    if (!ParseIPLiteralToNumber(literal_address, &address))
-      continue;
-    networks->push_back(NetworkInterface(name, address));
+    CHECK(ParseIPLiteralToNumber(literal_address, &address));
+    networks->push_back(
+        NetworkInterface(name, address, static_cast<uint8>(net_mask)));
   }
   return true;
 #else
   // getifaddrs() may require IO operations.
   base::ThreadRestrictions::AssertIOAllowed();
 
   ifaddrs *interfaces;
   if (getifaddrs(&interfaces) < 0) {
     PLOG(ERROR) << "getifaddrs";
     return false;
@@ skipping 29 matching lines @@
           reinterpret_cast<struct sockaddr_in*>(addr);
       addr_size = sizeof(*addr_in);
       if (addr_in->sin_addr.s_addr == INADDR_LOOPBACK ||
           addr_in->sin_addr.s_addr == 0) {
         continue;
       }
     } else {
       // Skip non-IP addresses.
       continue;
     }
+
     IPEndPoint address;
     std::string name = interface->ifa_name;
     if (address.FromSockAddr(addr, addr_size)) {
-      networks->push_back(NetworkInterface(name, address.address()));
+      uint8 net_mask = 0;
+      if (interface->ifa_netmask) {
+        IPEndPoint netmask;
+        if (netmask.FromSockAddr(interface->ifa_netmask, addr_size)) {
+          net_mask = MaskPrefixLength(netmask.address());
+        }
+      }
+
+      networks->push_back(NetworkInterface(name, address.address(), net_mask));
     }
   }
 
   freeifaddrs(interfaces);
 
   return true;
 #endif
 }
 
 WifiPHYLayerProtocol GetWifiPHYLayerProtocol() {
   return WIFI_PHY_LAYER_PROTOCOL_UNKNOWN;
 }
 
 }  // namespace net