Implement SetNetworkDeviceProperty() and ClearNetworkDeviceProperty().

chromeos_network.cc

 // Copyright (c) 2009 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 "chromeos_network.h"  // NOLINT
 
 #include <algorithm>
 #include <cstring>
 #include <list>
 #include <set>
@@ skipping 1898 matching lines @@
       // aren't passed through this mechanism, and so we're not going to
       // bother to try converting them.
       // If we get here, it's a programming error, so complain.
       LOG(ERROR) << "Unconverted Value of type: " << value->GetType();
       return NULL;
   }
   LOG(ERROR) << "Value conversion failed, type: " << value->GetType();
   return NULL;
 }
 
-
-extern "C"
-void ChromeOSSetNetworkServiceProperty(const char* service_path,
-                                       const char* property,
-                                       const ::Value* setting) {
-  FlimflamCallbackData* cb_data =
-      new FlimflamCallbackData(kFlimflamServiceInterface, service_path);
-
-  // DEPRECATED
-  // Backwards-compatibility for "CertPath=SETTINGS:key_id=1,cert_id=2,..."
-  if (strcmp(property, "CertPath") == 0) {
-    std::string certpath;
-    if (setting->GetAsString(&certpath)) {
-      // Synchronous call for backwards compatibility.
-      // TODO(njw): remove once CertPath is deprecated in favor of
-      // explicit EAP.* properties.
-      set_certpath_properties(certpath.c_str(), cb_data->proxy.get());
-    }
-    delete cb_data;
-    return;
-  }
-
+static void SetNetworkProperty(FlimflamCallbackData *cb_data,
+                               const char* property,
+                               const ::Value* setting) {
   // Start the DBus call. FlimflamNotifyHandleError will get called when
   // it completes and log any errors.
   scoped_ptr<glib::Value> gsetting(ConvertToGlibValue(setting));
   DBusGProxyCall* call_id = ::dbus_g_proxy_begin_call(
       cb_data->proxy->gproxy(),
       kSetPropertyFunction,
       &FlimflamNotifyHandleError,
       cb_data,
       &DeleteFlimflamCallbackData,
       G_TYPE_STRING,
       property,
       G_TYPE_VALUE,
       gsetting.get(),
       G_TYPE_INVALID);
   if (!call_id) {
     LOG(ERROR) << "NULL call_id for: " << kSetPropertyFunction;
     delete cb_data;
   }
 }
 
-extern "C"
-void ChromeOSClearNetworkServiceProperty(const char* service_path,
-                                         const char* property) {
-  FlimflamCallbackData* cb_data =
-      new FlimflamCallbackData(kFlimflamServiceInterface, service_path);
-
+static void ClearNetworkProperty(FlimflamCallbackData *cb_data,
+                                 const char* property) {
   // Start the DBus call. FlimflamNotifyHandleError will get called when
   // it completes and log any errors.
   DBusGProxyCall* call_id = ::dbus_g_proxy_begin_call(
       cb_data->proxy->gproxy(),
       kClearPropertyFunction,
       &FlimflamNotifyHandleError,
       cb_data,
       &DeleteFlimflamCallbackData,
       G_TYPE_STRING,
       property,
       G_TYPE_INVALID);
   if (!call_id) {
     LOG(ERROR) << "NULL call_id for: " << kClearPropertyFunction;
     delete cb_data;
   }
 }
 
+extern "C"
+void ChromeOSSetNetworkServiceProperty(const char* service_path,
+                                       const char* property,
+                                       const ::Value* setting) {
+  FlimflamCallbackData* cb_data =
+      new FlimflamCallbackData(kFlimflamServiceInterface, service_path);
+
+  // DEPRECATED
+  // Backwards-compatibility for "CertPath=SETTINGS:key_id=1,cert_id=2,..."
+  if (strcmp(property, "CertPath") == 0) {
+    std::string certpath;
+    if (setting->GetAsString(&certpath)) {
+      // Synchronous call for backwards compatibility.
+      // TODO(njw): remove once CertPath is deprecated in favor of
+      // explicit EAP.* properties.
+      set_certpath_properties(certpath.c_str(), cb_data->proxy.get());
+    }
+    delete cb_data;
+    return;
+  }
+
+  SetNetworkProperty(cb_data, property, setting);
+}
+
+extern "C"
+void ChromeOSClearNetworkServiceProperty(const char* service_path,
+                                         const char* property) {
+  FlimflamCallbackData* cb_data =
+      new FlimflamCallbackData(kFlimflamServiceInterface, service_path);
+
+  ClearNetworkProperty(cb_data, property);
+}
+
+extern "C"
+void ChromeOSSetNetworkDeviceProperty(const char* device_path,
+                                      const char* property,
+                                      const ::Value* setting) {
+  FlimflamCallbackData* cb_data =
+      new FlimflamCallbackData(kFlimflamDeviceInterface, device_path);
+
+  SetNetworkProperty(cb_data, property, setting);
+}
+
+extern "C"
+void ChromeOSClearNetworkDeviceProperty(const char* device_path,
+                                        const char* property) {
+  FlimflamCallbackData* cb_data =
+      new FlimflamCallbackData(kFlimflamDeviceInterface, device_path);
+
+  ClearNetworkProperty(cb_data, property);
+}
+
 // Cashew services
 
 extern "C"
 void ChromeOSFreeCellularDataPlanList(CellularDataPlanList* data_plan_list) {
   if (data_plan_list == NULL)
     return;
   if (data_plan_list->plans_size > 0) {
     std::for_each(data_plan_list->plans,
                   data_plan_list->plans + data_plan_list->plans_size,
                   &DeleteDataPlanProperties);
@@ skipping 534 matching lines @@
 }
 
 extern "C"
 void ChromeOSDisconnectSMSMonitor(SMSMonitor monitor) {
   if (monitor->connection())
     dbus::Disconnect(monitor->connection());
   delete monitor;
 }
 
 }  // namespace chromeos