commit f54872f0fbb1ad16aa4ed15a261c79477c6087a0
author Wade Guthrie <wdg@chromium.org> Thu Apr 11 15:11:50 2013 -0700
committer ChromeBot <chrome-bot@google.com> Wed Apr 24 00:05:53 2013 -0700
tree 357868eca78b4c29db2279052fc89a39cfcf9e64
parent ade9b9a914efaeac3b2f4d4888ffdfb3e76b76f6

shill: Adds BSS nl80211 attribute.

The BSS attribute, which is contained in the
NL80211_CMD_NEW_SCAN_RESULTS netlink message, contains SSID information
received from a scan.

BUG=chromium:221118
TEST=unittest.

Change-Id: I20766ae6d73ae5729e4ae8de47cac8bcbf5b3fe9
Reviewed-on: https://gerrit.chromium.org/gerrit/48013
Reviewed-by: Wade Guthrie <wdg@chromium.org>
Tested-by: Wade Guthrie <wdg@chromium.org>
Commit-Queue: Wade Guthrie <wdg@chromium.org>

netlink_attribute.cc

diff --git a/netlink_attribute.cc b/netlink_attribute.cc
index af1c842..a934074 100644
--- a/netlink_attribute.cc
+++ b/netlink_attribute.cc
@@ -15,6 +15,7 @@
 #include "shill/control_netlink_attribute.h"
 #include "shill/logging.h"
 #include "shill/nl80211_attribute.h"
+#include "shill/wifi.h"
 
 using std::map;
 using std::string;
@@ -42,6 +43,9 @@
 NetlinkAttribute *NetlinkAttribute::NewNl80211AttributeFromId(int id) {
   scoped_ptr<NetlinkAttribute> attr;
   switch (id) {
+    case NL80211_ATTR_BSS:
+      attr.reset(new Nl80211AttributeBss());
+      break;
     case NL80211_ATTR_COOKIE:
       attr.reset(new Nl80211AttributeCookie());
       break;
@@ -626,6 +630,21 @@
       value_.size() + 1);
 }
 
+// SSID attribute.
+
+bool NetlinkSsidAttribute::ToString(string *output) const {
+  if (!output) {
+    LOG(ERROR) << "Null |output| parameter";
+    return false;
+  }
+  string value;
+  if (!GetStringValue(&value))
+    return false;
+
+  *output = WiFi::LogSSID(value);
+  return true;
+}
+
 // NetlinkNestedAttribute
 
 const char NetlinkNestedAttribute::kMyTypeString[] = "nested";