Use ConfigureWifiService() instead of GetWifiService()

flimflam.cc

 // Copyright (c) 2010 The Chromium OS 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 "entd/flimflam.h"
 
 #include <string>
 #include <list>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "cros/chromeos_cros_api.h"
 #include "cros/chromeos_network.h"
 #include "entd/utils.h"
 
 namespace entd {
 using chromeos::FreeServiceInfo;
 using chromeos::GetWifiService;
+using chromeos::ConfigureWifiService;
 using chromeos::ServiceInfo;
 
 const char Flimflam::kLibcrosPath[] =
     "/opt/google/chrome/chromeos/libcros.so";
 
 Flimflam::~Flimflam() {
   CleanupTemplate();  // We only have one Flimflam instance
 }
 
 bool Load(std::string* load_error_string) {
@@ skipping 48 matching lines @@
   cert_path = utils::ValueAsUtf8String(args[3]);
   if (!IsStringASCII(cert_path)) {
     return v8_fail(
         "cert_path contains illegal characters in call to configNetwork");
   }
 
   std::string error;
   if (!Load(&error))
     return v8_fail(error);
 
-  ServiceInfo* ssid_info = GetWifiService(ssid.c_str(),
-                                          chromeos::SECURITY_8021X);
-  if (ssid_info) {
-    if (!chromeos::SetIdentity(ssid_info->service_path, user.c_str())) {
-      FreeServiceInfo(ssid_info);
-      return v8_fail("Failed to set identity");
-    }
-    if (!chromeos::SetPassphrase(ssid_info->service_path, pass.c_str())) {
-      FreeServiceInfo(ssid_info);
-      return v8_fail("Failed to set passphrase");
-    }
-    if (!chromeos::SetCertPath(ssid_info->service_path, cert_path.c_str())) {
-      FreeServiceInfo(ssid_info);
-      return v8_fail("Failed to set cert path");
-    }
-    return v8::True();
-  }
-  return v8::False();
+  if (!ConfigureWifiService(ssid.c_str(),chromeos::SECURITY_8021X,
+                            pass.c_str(), user.c_str(), cert_path.c_str()))
+    return v8_fail("Failed to configure wifi service");
+
+  return v8::True();
 }
 
 // bool disconnectNetwork(const char* ssid);
 static v8::Handle<v8::Value> dispatch_disconnectNetwork(
     const v8::Arguments& args) {
   if (args.Length() != 1)
     return v8_fail("Incorrect number of args to disconnectNetwork");
 
   std::string ssid;
 
@@ skipping 22 matching lines @@
 // static
 void Flimflam::SetTemplateBindings(
     v8::Handle<v8::ObjectTemplate> template_object) {
   template_object->Set(v8::String::NewSymbol("configNetwork"),
                        v8::FunctionTemplate::New(dispatch_configNetwork));
   template_object->Set(v8::String::NewSymbol("disconnectNetwork"),
                        v8::FunctionTemplate::New(dispatch_disconnectNetwork));
 }
 
 } // namespace entd