Bluetooth: Implement new socket API for Chrome OS

chromeos/dbus/bluetooth_profile_manager_client.cc

 // Copyright 2013 The Chromium 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/dbus/bluetooth_profile_manager_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 const char BluetoothProfileManagerClient::kNoResponseError[] =
     "org.chromium.Error.NoResponse";
 
 
-BluetoothProfileManagerClient::Options::Options()
-    : role(SYMMETRIC),
-      require_authentication(false),
-      require_authorization(false),
-      auto_connect(true) {
+BluetoothProfileManagerClient::Options::Options() {
 }
 
 BluetoothProfileManagerClient::Options::~Options() {
 }
 
 // The BluetoothProfileManagerClient implementation used in production.
 class BluetoothProfileManagerClientImpl
     : public BluetoothProfileManagerClient {
  public:
   BluetoothProfileManagerClientImpl() : weak_ptr_factory_(this) {}
@@ skipping 13 matching lines @@
 
     dbus::MessageWriter writer(&method_call);
     writer.AppendObjectPath(profile_path);
     writer.AppendString(uuid);
 
     dbus::MessageWriter array_writer(NULL);
     writer.OpenArray("{sv}", &array_writer);
 
     dbus::MessageWriter dict_writer(NULL);
 
-    // Always send Name, even if empty string.
-    array_writer.OpenDictEntry(&dict_writer);
-    dict_writer.AppendString(bluetooth_profile_manager::kNameOption);
-    dict_writer.AppendVariantOfString(options.name);
-    array_writer.CloseContainer(&dict_writer);
+    // Send Name if provided.
+    if (options.name.get() != NULL) {

[armansito, 2014/05/13 19:44:59]

Does it make sense to check for empty string here or is that ok?

[keybuk, 2014/05/13 20:03:53]

If the caller explicitly sets empty string, then we should pass that forward to
BlueZ

+      array_writer.OpenDictEntry(&dict_writer);
+      dict_writer.AppendString(bluetooth_profile_manager::kNameOption);
+      dict_writer.AppendVariantOfString(*(options.name));
+      array_writer.CloseContainer(&dict_writer);
+    }
 
-    // Don't send Service if not provided.
-    if (options.service.length()) {
+    // Send Service if provided.
+    if (options.service.get() != NULL) {

[armansito, 2014/05/13 19:44:59]

Check for empty string?

[keybuk, 2014/05/13 20:03:53]

As above, while this is usually a UUID, BlueZ might interpret "" differently to
"property not in dict"

       dbus::MessageWriter dict_writer(NULL);
       array_writer.OpenDictEntry(&dict_writer);
       dict_writer.AppendString(bluetooth_profile_manager::kServiceOption);
-      dict_writer.AppendVariantOfString(options.service);
+      dict_writer.AppendVariantOfString(*(options.service));
       array_writer.CloseContainer(&dict_writer);
     }
 
-    // Don't send the default Role since there's no value for it.
+    // Send Role if not the default value.
     if (options.role != SYMMETRIC) {
       dbus::MessageWriter dict_writer(NULL);
       array_writer.OpenDictEntry(&dict_writer);
       dict_writer.AppendString(bluetooth_profile_manager::kRoleOption);
       if (options.role == CLIENT)
         dict_writer.AppendVariantOfString(
             bluetooth_profile_manager::kClientRoleOption);
       else if (options.role == SERVER)
         dict_writer.AppendVariantOfString(
             bluetooth_profile_manager::kServerRoleOption);
       else
         dict_writer.AppendVariantOfString("");
       array_writer.CloseContainer(&dict_writer);
     }
 
-    // Don't send Channel unless given.
-    if (options.channel) {
+    // Send Channel if provided.
+    if (options.channel.get() != NULL) {
       dbus::MessageWriter dict_writer(NULL);
       array_writer.OpenDictEntry(&dict_writer);
       dict_writer.AppendString(bluetooth_profile_manager::kChannelOption);
-      dict_writer.AppendVariantOfUint16(options.channel);
+      dict_writer.AppendVariantOfUint16(*(options.channel));
       array_writer.CloseContainer(&dict_writer);
     }
 
-    // Don't send PSM unless given.
-    if (options.psm) {
+    // Send PSM if provided.
+    if (options.psm.get() != NULL) {
       dbus::MessageWriter dict_writer(NULL);
       array_writer.OpenDictEntry(&dict_writer);
       dict_writer.AppendString(bluetooth_profile_manager::kPSMOption);
-      dict_writer.AppendVariantOfUint16(options.psm);
+      dict_writer.AppendVariantOfUint16(*(options.psm));
       array_writer.CloseContainer(&dict_writer);
     }
 
-    // Always send RequireAuthentication, RequireAuthorization and AutoConnect.
-    array_writer.OpenDictEntry(&dict_writer);
-    dict_writer.AppendString(
-        bluetooth_profile_manager::kRequireAuthenticationOption);
-    dict_writer.AppendVariantOfBool(options.require_authentication);
-    array_writer.CloseContainer(&dict_writer);
+    // Send RequireAuthentication if provided.
+    if (options.require_authentication.get() != NULL) {
+      array_writer.OpenDictEntry(&dict_writer);
+      dict_writer.AppendString(
+          bluetooth_profile_manager::kRequireAuthenticationOption);
+      dict_writer.AppendVariantOfBool(*(options.require_authentication));
+      array_writer.CloseContainer(&dict_writer);
+    }
 
-    array_writer.OpenDictEntry(&dict_writer);
-    dict_writer.AppendString(
-        bluetooth_profile_manager::kRequireAuthorizationOption);
-    dict_writer.AppendVariantOfBool(options.require_authorization);
-    array_writer.CloseContainer(&dict_writer);
+    // Send RequireAuthorization if provided.
+    if (options.require_authorization.get() != NULL) {
+      array_writer.OpenDictEntry(&dict_writer);
+      dict_writer.AppendString(
+          bluetooth_profile_manager::kRequireAuthorizationOption);
+      dict_writer.AppendVariantOfBool(*(options.require_authorization));
+      array_writer.CloseContainer(&dict_writer);
+    }
 
-    array_writer.OpenDictEntry(&dict_writer);
-    dict_writer.AppendString(
-        bluetooth_profile_manager::kAutoConnectOption);
-    dict_writer.AppendVariantOfBool(options.auto_connect);
-    array_writer.CloseContainer(&dict_writer);
+    // Send AutoConnect if provided.
+    if (options.auto_connect.get() != NULL) {
+      array_writer.OpenDictEntry(&dict_writer);
+      dict_writer.AppendString(
+          bluetooth_profile_manager::kAutoConnectOption);
+      dict_writer.AppendVariantOfBool(*(options.auto_connect));
+      array_writer.CloseContainer(&dict_writer);
+    }
 
-    // Don't send ServiceRecord if not provided.
-    if (options.service_record.length()) {
+    // Send ServiceRecord if provided.
+    if (options.service_record.get() != NULL) {

[armansito, 2014/05/13 19:44:59]

Check for empty string?

[keybuk, 2014/05/13 20:03:53]

"" is a valid service record, while "property not present" means BlueZ will
create a service record

       dbus::MessageWriter dict_writer(NULL);
       array_writer.OpenDictEntry(&dict_writer);
       dict_writer.AppendString(bluetooth_profile_manager::kServiceRecordOption);
-      dict_writer.AppendVariantOfString(options.service_record);
+      dict_writer.AppendVariantOfString(*(options.service_record));
       array_writer.CloseContainer(&dict_writer);
     }
 
-    // Don't send Version if not provided.
-    if (options.version) {
+    // Send Version if provided.
+    if (options.version.get() != NULL) {
       dbus::MessageWriter dict_writer(NULL);
       array_writer.OpenDictEntry(&dict_writer);
       dict_writer.AppendString(bluetooth_profile_manager::kVersionOption);
-      dict_writer.AppendVariantOfUint16(options.version);
+      dict_writer.AppendVariantOfUint16(*(options.version));
       array_writer.CloseContainer(&dict_writer);
     }
 
-    // Don't send Features if not provided.
-    if (options.features) {
+    // Send Features if provided.
+    if (options.features.get() != NULL) {
       dbus::MessageWriter dict_writer(NULL);
       array_writer.OpenDictEntry(&dict_writer);
       dict_writer.AppendString(bluetooth_profile_manager::kFeaturesOption);
-      dict_writer.AppendVariantOfUint16(options.features);
+      dict_writer.AppendVariantOfUint16(*(options.features));
       array_writer.CloseContainer(&dict_writer);
     }
 
     writer.CloseContainer(&array_writer);
 
     object_proxy_->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothProfileManagerClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
@@ skipping 70 matching lines @@
 }
 
 BluetoothProfileManagerClient::~BluetoothProfileManagerClient() {
 }
 
 BluetoothProfileManagerClient* BluetoothProfileManagerClient::Create() {
   return new BluetoothProfileManagerClientImpl();
 }
 
 }  // namespace chromeos