summaryrefslogtreecommitdiffstats
path: root/components/wifi/network_properties.cc
diff options
context:
space:
mode:
authorpneubeck <pneubeck@chromium.org>2015-01-13 09:14:27 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-13 17:16:01 +0000
commit63f02baf9abbb2f28e2f1676ed10310fcf22eeb2 (patch)
treefee99e352b89336b66261f25ff017017d12d6cb0 /components/wifi/network_properties.cc
parentd8c8e56321d4c9135ad7d5015db99fbb0e2ec4c2 (diff)
downloadchromium_src-63f02baf9abbb2f28e2f1676ed10310fcf22eeb2.zip
chromium_src-63f02baf9abbb2f28e2f1676ed10310fcf22eeb2.tar.gz
chromium_src-63f02baf9abbb2f28e2f1676ed10310fcf22eeb2.tar.bz2
ONC: Use HexSSID instead of SSID.
- Comparison of a network policy with network will use HexSSID now. - Translation from ONC to Shill now copies the HexSSID instead of translating SSID. - Fix ONC validation of HexSSID/SSID to be case insensitive. - When setting an ONC: SSID will be ignored if HexSSID is present - Reading network properties reports a HexSSID in ONC. BUG=432546 Review URL: https://codereview.chromium.org/823633004 Cr-Commit-Position: refs/heads/master@{#311281}
Diffstat (limited to 'components/wifi/network_properties.cc')
-rw-r--r--components/wifi/network_properties.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/components/wifi/network_properties.cc b/components/wifi/network_properties.cc
index 8656165..49aeb69 100644
--- a/components/wifi/network_properties.cc
+++ b/components/wifi/network_properties.cc
@@ -6,6 +6,7 @@
#include "base/json/json_reader.h"
#include "base/message_loop/message_loop.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "components/onc/onc_constants.h"
@@ -54,6 +55,8 @@ scoped_ptr<base::DictionaryValue> NetworkProperties::ToValue(
if (!bssid.empty())
wifi->SetString(onc::wifi::kBSSID, bssid);
wifi->SetString(onc::wifi::kSSID, ssid);
+ wifi->SetString(onc::wifi::kHexSSID,
+ base::HexEncode(ssid.c_str(), ssid.size()));
}
value->Set(onc::network_type::kWiFi, wifi.release());