From patchwork Wed Dec 7 01:35:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 631632 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65438C352A1 for ; Wed, 7 Dec 2022 01:35:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229797AbiLGBfg (ORCPT ); Tue, 6 Dec 2022 20:35:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229576AbiLGBfe (ORCPT ); Tue, 6 Dec 2022 20:35:34 -0500 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1D904B9A1 for ; Tue, 6 Dec 2022 17:35:33 -0800 (PST) Received: by mail-pg1-x52f.google.com with SMTP id v3so14959081pgh.4 for ; Tue, 06 Dec 2022 17:35:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=F99bIoVtHG8cjb55LqZzKd/PjrOlVr7ynteymuxY+mc=; b=PPWopMzsZsHtwRtL4ZDlv5UCi2PJufZfUSWIpvtaz5kbr2XB4pBmGZn/55QO0t8eHk ypx1nOaCXUoR+mxYeX/1Ef47ULwKlN4Hesru1Yid7Qbk7UCnTywNzTxbd1pOoV3U5oI4 3SLGPF0v8ecCRcmdkKpoXoYS83f1n/T0FQORZbP3ef8jfCRYDd+W5A3jpjJWaTgr6Av+ fgHLwF0r4qZ0MdBGXMl6eUZ8+YgtViJhF9ACBNN09LbrcPyTBZtzucsDWxkV5JcXh398 W/AWEalx1HTR5dWkwPs8noq9CF68xBgQz1VzytBK+jjyOBaMXIxTxciE19WgAXdJDrMN YA/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=F99bIoVtHG8cjb55LqZzKd/PjrOlVr7ynteymuxY+mc=; b=0QeF3JvxCPsPqvkiNQF28Q/B2BaBt/foCtwaEf+7Uq3Yh/F5a7NdrWg9CD3DyZ04Mp jCiQ8NIuTu0u8QxDiRPSKGo5KIhDLnAtFrd0/Xz721onyr5Fq/nzdGLrWLAcem5+7d6A B5tTfsklX+bDrK0AGmH17x3jDjlG8iM8PYQA8BP3/Ze5yoepefvGwIbK9RwxWrNMgJOy xbotypQk9gVltmplArA5BmADDUmoI2XgJvorwvCKVqz6fdbH7QYRRu0u3Vqaq527RwOC 3bWjboeLWS0j82jnNEbXIj//cNC7JRTLHw/t1EpgUC32GIjmtSpaqbzT913j6/eszXxr repg== X-Gm-Message-State: ANoB5pkFPgV1OheNtXONFMvrrBTZaS5dR+tVNJa+hev3eTruZ5BAg7jf 4MMU6UnviiL6nz1y4KtqPQ99HOgvo2n+Twat X-Google-Smtp-Source: AA0mqf743NdW69LqSAOqAJUWivWyVklAPgabkSXtYwhhsi0MVyvoEW1gIGHOWpw+S81+oQ/1ktzSjA== X-Received: by 2002:a62:ed03:0:b0:572:6da6:de57 with SMTP id u3-20020a62ed03000000b005726da6de57mr72943087pfh.30.1670376932739; Tue, 06 Dec 2022 17:35:32 -0800 (PST) Received: from lvondent-mobl4.. (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id k1-20020a170902c40100b00188fc33e96dsm13318903plk.198.2022.12.06.17.35.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Dec 2022 17:35:32 -0800 (PST) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ 1/2] bthost: Add callback to accept ISO connections Date: Tue, 6 Dec 2022 17:35:29 -0800 Message-Id: <20221207013531.4162381-1-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This enables setting an accept callback which can return reject reason if the connection shall not be accepted. --- emulator/bthost.c | 21 ++++++++++++++++++--- emulator/bthost.h | 5 +++-- tools/iso-tester.c | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/emulator/bthost.c b/emulator/bthost.c index b05198953506..3cce4666c4e7 100644 --- a/emulator/bthost.c +++ b/emulator/bthost.c @@ -224,6 +224,7 @@ struct bthost { void *cmd_complete_data; bthost_new_conn_cb new_conn_cb; void *new_conn_data; + bthost_accept_conn_cb accept_iso_cb; bthost_new_conn_cb new_iso_cb; void *new_iso_data; struct rfcomm_connection_data *rfcomm_conn_data; @@ -1465,12 +1466,25 @@ static void evt_le_cis_req(struct bthost *bthost, const void *data, uint8_t len) { const struct bt_hci_evt_le_cis_req *ev = data; struct bt_hci_cmd_le_accept_cis cmd; + struct bt_hci_cmd_le_reject_cis rej; if (len < sizeof(*ev)) return; - memset(&cmd, 0, sizeof(cmd)); + if (bthost->accept_iso_cb) { + memset(&rej, 0, sizeof(rej)); + rej.reason = bthost->accept_iso_cb(le16_to_cpu(ev->cis_handle), + bthost->new_iso_data); + if (rej.reason) { + rej.handle = ev->cis_handle; + send_command(bthost, BT_HCI_CMD_LE_REJECT_CIS, + &rej, sizeof(rej)); + return; + } + } + + memset(&cmd, 0, sizeof(cmd)); cmd.handle = ev->cis_handle; send_command(bthost, BT_HCI_CMD_LE_ACCEPT_CIS, &cmd, sizeof(cmd)); @@ -2893,9 +2907,10 @@ void bthost_set_connect_cb(struct bthost *bthost, bthost_new_conn_cb cb, bthost->new_conn_data = user_data; } -void bthost_set_iso_cb(struct bthost *bthost, bthost_new_conn_cb cb, - void *user_data) +void bthost_set_iso_cb(struct bthost *bthost, bthost_accept_conn_cb accept, + bthost_new_conn_cb cb, void *user_data) { + bthost->accept_iso_cb = accept; bthost->new_iso_cb = cb; bthost->new_iso_data = user_data; } diff --git a/emulator/bthost.h b/emulator/bthost.h index 2cfdef766e4d..c424444763c4 100644 --- a/emulator/bthost.h +++ b/emulator/bthost.h @@ -44,13 +44,14 @@ typedef void (*bthost_cmd_complete_cb) (uint16_t opcode, uint8_t status, void bthost_set_cmd_complete_cb(struct bthost *bthost, bthost_cmd_complete_cb cb, void *user_data); +typedef uint8_t (*bthost_accept_conn_cb) (uint16_t handle, void *user_data); typedef void (*bthost_new_conn_cb) (uint16_t handle, void *user_data); void bthost_set_connect_cb(struct bthost *bthost, bthost_new_conn_cb cb, void *user_data); -void bthost_set_iso_cb(struct bthost *bthost, bthost_new_conn_cb cb, - void *user_data); +void bthost_set_iso_cb(struct bthost *bthost, bthost_accept_conn_cb accept, + bthost_new_conn_cb cb, void *user_data); void bthost_hci_connect(struct bthost *bthost, const uint8_t *bdaddr, uint8_t addr_type); diff --git a/tools/iso-tester.c b/tools/iso-tester.c index 269fbe2d6c62..d29f35695a00 100644 --- a/tools/iso-tester.c +++ b/tools/iso-tester.c @@ -752,7 +752,7 @@ static void setup_powered_callback(uint8_t status, uint16_t length, continue; if (isodata->send || isodata->recv || isodata->disconnect) - bthost_set_iso_cb(host, iso_new_conn, data); + bthost_set_iso_cb(host, NULL, iso_new_conn, data); if (isodata->bcast) { bthost_set_pa_params(host);