tools/btpclient: Add pair, unpair commands 43/205043/1
authorGrzegorz Kolodziejczyk <grzegorz.kolodziejczyk@codecoup.pl>
Thu, 25 Jan 2018 15:53:31 +0000 (16:53 +0100)
committerAmit Purwar <amit.purwar@samsung.com>
Mon, 29 Apr 2019 04:16:32 +0000 (09:46 +0530)
This patch adds pair and unpair commands for btp client.

Change-Id: I04baa008741bfd6231cc95114c69c75711eb08a8
Signed-off-by: Amit Purwar <amit.purwar@samsung.com>
tools/btpclient.c

index d92f3e9..f858fd4 100644 (file)
@@ -312,6 +312,8 @@ static void btp_gap_read_commands(uint8_t index, const void *param,
        commands |= (1 << BTP_OP_GAP_CONNECT);
        commands |= (1 << BTP_OP_GAP_DISCONNECT);
        commands |= (1 << BTP_OP_GAP_SET_IO_CAPA);
+       commands |= (1 << BTP_OP_GAP_PAIR);
+       commands |= (1 << BTP_OP_GAP_UNPAIR);
 
        commands = L_CPU_TO_LE16(commands);
 
@@ -2076,6 +2078,143 @@ failed:
        btp_send_error(btp, BTP_GAP_SERVICE, index, status);
 }
 
+static void pair_reply(struct l_dbus_proxy *proxy,
+                               struct l_dbus_message *result, void *user_data)
+{
+       uint8_t adapter_index = L_PTR_TO_UINT(user_data);
+       struct btp_adapter *adapter = find_adapter_by_index(adapter_index);
+
+       if (!adapter)
+               return;
+
+       if (l_dbus_message_is_error(result)) {
+               const char *name, *desc;
+
+               l_dbus_message_get_error(result, &name, &desc);
+               l_error("Failed to pair (%s), %s", name, desc);
+
+               return;
+       }
+}
+
+static void btp_gap_pair(uint8_t index, const void *param, uint16_t length,
+                                                               void *user_data)
+{
+       struct btp_adapter *adapter = find_adapter_by_index(index);
+       const struct btp_gap_pair_cp *cp = param;
+       uint8_t status = BTP_ERROR_FAIL;
+       struct btp_device *device;
+       bool prop;
+
+       if (!adapter) {
+               status = BTP_ERROR_INVALID_INDEX;
+               goto failed;
+       }
+
+       /* Adapter needs to be powered to be able to pair */
+       if (!l_dbus_proxy_get_property(adapter->proxy, "Powered", "b", &prop) ||
+                                                                       !prop)
+               goto failed;
+
+       device = find_device_by_address(adapter, &cp->address,
+                                                       cp->address_type);
+
+       if (!device)
+               goto failed;
+
+       /* This command is asynchronous, send reply immediatelly to not block
+        * pairing process eg. passkey request.
+        */
+       btp_send(btp, BTP_GAP_SERVICE, BTP_OP_GAP_PAIR, adapter->index, 0,
+                                                                       NULL);
+
+       l_dbus_proxy_method_call(device->proxy, "Pair", NULL, pair_reply,
+                                       L_UINT_TO_PTR(adapter->index), NULL);
+
+       return;
+
+failed:
+       btp_send_error(btp, BTP_GAP_SERVICE, index, status);
+}
+
+static void unpair_reply(struct l_dbus_proxy *proxy,
+                               struct l_dbus_message *result, void *user_data)
+{
+       struct btp_device *device = user_data;
+       struct btp_adapter *adapter = find_adapter_by_device(device);
+
+       if (!adapter) {
+               btp_send_error(btp, BTP_GAP_SERVICE, BTP_INDEX_NON_CONTROLLER,
+                                                               BTP_ERROR_FAIL);
+               return;
+       }
+
+       if (l_dbus_message_is_error(result)) {
+               const char *name, *desc;
+
+               l_dbus_message_get_error(result, &name, &desc);
+               l_error("Failed to unpair (%s), %s", name, desc);
+
+               btp_send_error(btp, BTP_GAP_SERVICE, adapter->index,
+                                                               BTP_ERROR_FAIL);
+               return;
+       }
+
+       btp_send(btp, BTP_GAP_SERVICE, BTP_OP_GAP_UNPAIR, adapter->index, 0,
+                                                                       NULL);
+}
+
+static void unpair_setup(struct l_dbus_message *message, void *user_data)
+{
+       struct btp_device *device = user_data;
+       const char *path = l_dbus_proxy_get_path(device->proxy);
+       struct l_dbus_message_builder *builder;
+
+       builder = l_dbus_message_builder_new(message);
+
+       l_dbus_message_builder_append_basic(builder, 'o', path);
+
+       l_dbus_message_builder_finalize(builder);
+       l_dbus_message_builder_destroy(builder);
+}
+
+static void btp_gap_unpair(uint8_t index, const void *param, uint16_t length,
+                                                               void *user_data)
+{
+       struct btp_adapter *adapter = find_adapter_by_index(index);
+       const struct btp_gap_pair_cp *cp = param;
+       uint8_t status = BTP_ERROR_FAIL;
+       struct btp_device *device;
+       bool prop;
+
+       if (!adapter) {
+               status = BTP_ERROR_INVALID_INDEX;
+               goto failed;
+       }
+
+       /* Adapter needs to be powered to be able to unpair */
+       if (!l_dbus_proxy_get_property(adapter->proxy, "Powered", "b", &prop) ||
+                                                                       !prop)
+               goto failed;
+
+       device = find_device_by_address(adapter, &cp->address,
+                                                       cp->address_type);
+
+       if (!device)
+               goto failed;
+
+       /* There is no direct unpair method, removing device will clear pairing
+        * information.
+        */
+       l_dbus_proxy_method_call(adapter->proxy, "RemoveDevice", unpair_setup,
+                                               unpair_reply, device, NULL);
+
+       return;
+
+failed:
+       btp_send_error(btp, BTP_GAP_SERVICE, index, status);
+}
+
 static void btp_gap_device_found_ev(struct l_dbus_proxy *proxy)
 {
        struct btp_device_found_ev ev;
@@ -2200,6 +2339,12 @@ static void register_gap_service(void)
 
        btp_register(btp, BTP_GAP_SERVICE, BTP_OP_GAP_SET_IO_CAPA,
                                btp_gap_set_io_capabilities, NULL, NULL);
+
+       btp_register(btp, BTP_GAP_SERVICE, BTP_OP_GAP_PAIR, btp_gap_pair, NULL,
+                                                                       NULL);
+
+       btp_register(btp, BTP_GAP_SERVICE, BTP_OP_GAP_UNPAIR, btp_gap_unpair,
+                                                               NULL, NULL);
 }
 
 static void btp_core_read_commands(uint8_t index, const void *param,