Add wifi AP info to system profile metrics

chrome/browser/metrics/network_metrics_provider.cc

 // Copyright 2014 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 "chrome/browser/metrics/network_metrics_provider.h"
 
 #include "base/compiler_specific.h"
+#include "base/logging.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/public/browser/browser_thread.h"
 
 using metrics::SystemProfileProto;
 
 NetworkMetricsProvider::NetworkMetricsProvider()
     : connection_type_is_ambiguous_(false),
       wifi_phy_layer_protocol_is_ambiguous_(false),
       wifi_phy_layer_protocol_(net::WIFI_PHY_LAYER_PROTOCOL_UNKNOWN),
@@ skipping 14 matching lines @@
   network->set_connection_type(GetConnectionType());
   network->set_wifi_phy_layer_protocol_is_ambiguous(
       wifi_phy_layer_protocol_is_ambiguous_);
   network->set_wifi_phy_layer_protocol(GetWifiPHYLayerProtocol());
 
   // Resets the "ambiguous" flags, since a new metrics log session has started.
   connection_type_is_ambiguous_ = false;
   // TODO(isherman): This line seems unnecessary.
   connection_type_ = net::NetworkChangeNotifier::GetConnectionType();
   wifi_phy_layer_protocol_is_ambiguous_ = false;
+
+  // Connected wifi access point information.
+  net::NetworkChangeNotifier::WifiAccessPointInfo info;
+  if (net::NetworkChangeNotifier::GetWifiAccessPointInfo(&info))
+    WriteWifiAccessPointProto(info, network);
 }
 
 void NetworkMetricsProvider::OnConnectionTypeChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   if (type == net::NetworkChangeNotifier::CONNECTION_NONE)
     return;
   if (type != connection_type_ &&
       connection_type_ != net::NetworkChangeNotifier::CONNECTION_NONE) {
     connection_type_is_ambiguous_ = true;
   }
@@ skipping 57 matching lines @@
 }
 
 void NetworkMetricsProvider::OnWifiPHYLayerProtocolResult(
     net::WifiPHYLayerProtocol mode) {
   if (wifi_phy_layer_protocol_ != net::WIFI_PHY_LAYER_PROTOCOL_UNKNOWN &&
       mode != wifi_phy_layer_protocol_) {
     wifi_phy_layer_protocol_is_ambiguous_ = true;
   }
   wifi_phy_layer_protocol_ = mode;
 }
+
+void NetworkMetricsProvider::WriteWifiAccessPointProto(
+    const net::NetworkChangeNotifier::WifiAccessPointInfo& info,
+    SystemProfileProto::Network* network_proto) {
+  SystemProfileProto::Network::WifiAccessPoint* ap_info =
+      network_proto->mutable_access_point_info();
+
+  SystemProfileProto::Network::WifiAccessPoint::SecurityMode security =
+      SystemProfileProto::Network::WifiAccessPoint::SECURITY_UNKNOWN;
+  switch (info.security) {
+    case net::NetworkChangeNotifier::WIFI_SECURITY_NONE:
+      security = SystemProfileProto::Network::WifiAccessPoint::SECURITY_NONE;
+      break;
+    case net::NetworkChangeNotifier::WIFI_SECURITY_WPA:
+      security = SystemProfileProto::Network::WifiAccessPoint::SECURITY_WPA;
+      break;
+    case net::NetworkChangeNotifier::WIFI_SECURITY_WEP:
+      security = SystemProfileProto::Network::WifiAccessPoint::SECURITY_WEP;
+      break;
+    case net::NetworkChangeNotifier::WIFI_SECURITY_RSN:
+      security = SystemProfileProto::Network::WifiAccessPoint::SECURITY_RSN;
+      break;
+    case net::NetworkChangeNotifier::WIFI_SECURITY_802_1X:
+      security = SystemProfileProto::Network::WifiAccessPoint::SECURITY_802_1X;
+      break;
+    case net::NetworkChangeNotifier::WIFI_SECURITY_PSK:
+      security = SystemProfileProto::Network::WifiAccessPoint::SECURITY_PSK;
+      break;
+    case net::NetworkChangeNotifier::WIFI_SECURITY_UNKNOWN:
+      security = SystemProfileProto::Network::WifiAccessPoint::SECURITY_UNKNOWN;
+      break;
+  }
+  ap_info->set_security_mode(security);
+
+  // |bssid| is xx:xx:xx:xx:xx:xx, extract the first three components and
+  // pack into a uint32.
+  std::string bssid = info.bssid;
+  if (bssid.size() == 17 && bssid[2] == ':' && bssid[5] == ':' &&
+      bssid[8] == ':' && bssid[11] == ':' && bssid[14] == ':') {
+    std::string vendor_prefix_str;
+    uint32 vendor_prefix;
+
+    base::RemoveChars(bssid.substr(0, 9), ":", &vendor_prefix_str);
+    DCHECK_EQ(6U, vendor_prefix_str.size());
+    if (base::HexStringToUInt(vendor_prefix_str, &vendor_prefix))
+      ap_info->set_vendor_prefix(vendor_prefix);
+    else
+      LOG(WARNING) << "Failed to convert vendor prefix: " << vendor_prefix_str;

[Ilya Sherman, 2014/07/11 01:32:17]

Can this be a NOTREACHED() instead?  If not, I'd at least make it a DVLOG(1) or
something -- I don't think this message needs to be included in production
builds of Chrome.

[zqiu1, 2014/07/14 17:21:57]

Will change to NOTREACHED()

+  }
+
+  SystemProfileProto::Network::WifiAccessPoint::VendorInformation* vendor =
+      ap_info->mutable_vendor_info();

[Ilya Sherman, 2014/07/11 01:32:17]

This actually sets creates a vendor_info field.  Please add code so that, if
none of the fields are set, the field gets cleared again.

[zqiu1, 2014/07/14 17:21:57]

Then that's no different than my original implementation where the vendor_info
field is only created when at least one of vendor fields are provided. I am new
to protobuf stuff, referring to the original comment, how do you tell if a
message is empty or not? Using SpaceUsed function?

[Ilya Sherman, 2014/07/14 21:25:54]

I agree that the functionality is equivalent -- my suggestion was more about
style and maintainability.  I think that BytesUsed() is indeed a reasonable way
to check whether the protocol buffer is empty.  I encourage you to test this
locally to verify.

Anyhow, if you really prefer not to dig into that and leave this as-is, then
LGTM.

+  if (!info.model_number.empty())
+    vendor->set_model_number(info.model_number);
+  if (!info.model_name.empty())
+    vendor->set_model_name(info.model_name);
+  if (!info.device_name.empty())
+    vendor->set_device_name(info.device_name);
+  // Parse OUI list.
+  if (!info.oui_list.empty()) {
+    std::vector<std::string> oui_list;
+    base::SplitString(info.oui_list, ' ', &oui_list);
+    for (std::vector<std::string>::const_iterator it = oui_list.begin();
+         it != oui_list.end();
+         ++it) {
+      uint32 oui;
+      if (base::HexStringToUInt(*it, &oui))
+        vendor->add_element_identifier(oui);
+      else
+        LOG(WARNING) << "Failed to convert element identifier: " << *it;

[Ilya Sherman, 2014/07/11 01:32:17]

Ditto.

[zqiu1, 2014/07/14 17:21:57]

Done.

+    }
+  }
+}