Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: chromeos/network/managed_network_configuration_handler_impl.cc

Issue 759663004: ONC: add support for non-utf-8 SSIDs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: adjusted onc_spec.html Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/network/managed_network_configuration_handler_impl.cc
diff --git a/chromeos/network/managed_network_configuration_handler_impl.cc b/chromeos/network/managed_network_configuration_handler_impl.cc
index eb16c55d7f5add1faea8b3ae6290bfadbe70cef0..54985b114066132fbc4ce0ea383ee8314a90c1bb 100644
--- a/chromeos/network/managed_network_configuration_handler_impl.cc
+++ b/chromeos/network/managed_network_configuration_handler_impl.cc
@@ -32,6 +32,7 @@
#include "chromeos/network/onc/onc_merger.h"
#include "chromeos/network/onc/onc_signature.h"
#include "chromeos/network/onc/onc_translator.h"
+#include "chromeos/network/onc/onc_utils.h"
#include "chromeos/network/onc/onc_validator.h"
#include "chromeos/network/policy_util.h"
#include "chromeos/network/shill_property_util.h"
@@ -289,6 +290,12 @@ void ManagedNetworkConfigurationHandlerImpl::SetProperties(
*user_settings_copy,
&validation_result);
+ // fill in HexSSID field from contents of SSID field if not set already
+ if (user_settings_copy.get() != NULL)
pneubeck (no reviews) 2014/11/27 14:49:02 nit: no .get()!=NULL and missing braces if (user_
cschuet (SLOW) 2014/11/27 15:44:30 Done.
+ onc::FillInHexSSIDFieldsInOncObject(
+ onc::kToplevelConfigurationSignature, user_settings_copy.get());
pneubeck (no reviews) 2014/11/27 14:49:02 bug: user_settings_copy -> validated_user_settings
cschuet (SLOW) 2014/11/27 15:44:30 Acknowledged.
+
+
if (validation_result == onc::Validator::INVALID) {
InvokeErrorCallback(service_path, error_callback, kInvalidUserSettings);
return;

Powered by Google App Engine
This is Rietveld 408576698