Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2606525pxb; Sun, 17 Oct 2021 20:19:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwD5qX5Oril/uWB1euXQjIIzE0ULYjhbfGbsI+MDa8qXyAfGq+Z1NnTSnJmfbRCOgPzIAGD X-Received: by 2002:a05:6a00:1a46:b0:44d:7a3f:2043 with SMTP id h6-20020a056a001a4600b0044d7a3f2043mr24342199pfv.56.1634527149003; Sun, 17 Oct 2021 20:19:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634527148; cv=none; d=google.com; s=arc-20160816; b=cMPLFOpb2ggdZEm3SdpLt2PAqASn5doG3qcMUDa20eb1/O+3ROqacrMiobXxhWt7Se v2sDhrTIKTQtUWiQ//Q/1Sg5mKKwljAWBywC58oFL7peVsbIuuMrbTTjW7FBLmo/wIhr CR7M7HF0exfkqN9GCjxWMVav3v95l8Rr+cR8yQPVocRb2P8HYiBwffz3CK2eUAUQB3pc F9nnTPGXXii3tmU4WXR3ZEn+OZ1TaM8rvohufIjeWunGkwHU5Gk5BHJhHFvXe9m7EPml EXrKDe+L5J0+CCw8QJQKShQzuFBAgbqFbFUchXvVhzgq7mGFkk73FwYQf4I5c+DYuiKp 91kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:to:from:dkim-signature; bh=dbUp97nMAfJPEEwmtIjAMFsS49UNI7EM1PidaU6Ju/k=; b=OXpHEZdq5SKuRPlSs7RvcP0DKLX7CfW7su8lsnLovUCcuLvrfJORJElyl1eqthm6XU HIALPF3VRblTxhlAArJkIm2JYHKZ1oLE7pLrSNzilZOEV/ygB+IJTWwzSIQu95+ZIyPV lmGsYxw5MPzf7YssdMgPY2yXqwHte3gOyPeTHsDStQth2lYBdH1tJwrZDtDSqL1nu9MZ kHIMAZu9dFlAMKLTF21y40RWfR/Y0mTJSsTiBWGnTnQmoj7TtizehJXrp/fnhheE6A8I VA/IA1rRxETL7JvJ2EkxxBZFixbAJlutcLBADNneyUr2aY2Sss51lU1PmZylefszTF3G PyQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qeXvccxg; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z2si20853147plg.183.2021.10.17.20.18.39; Sun, 17 Oct 2021 20:19:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=qeXvccxg; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243332AbhJOWow (ORCPT + 99 others); Fri, 15 Oct 2021 18:44:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234009AbhJOWov (ORCPT ); Fri, 15 Oct 2021 18:44:51 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF5F2C061570 for ; Fri, 15 Oct 2021 15:42:44 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id t184so8691759pfd.0 for ; Fri, 15 Oct 2021 15:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=dbUp97nMAfJPEEwmtIjAMFsS49UNI7EM1PidaU6Ju/k=; b=qeXvccxgGt0iOxV0Jn2/HarIvNlXx9ZWFBsS3UJQZoO8zQy/Qyq/GElT6fjwYjUg+M /0Kjm4oCDl9h3gnlUT+f0jdubCRNCgt3qmHlvVeBCKGshGnOwvTSVtnf5zGcOhX1or+g ZEjLkvpbFbkSu8UGIDQLP0C1P2/tFvqHvD4B7bk2arA+bf2py6kO1TghNkxpEK1qb6J6 wZxXmbYVCG8rIqrY9R+GqyMp3BPYCWJ7DaxcZFFGmcslDE+bn5arDTHOnyKCHqNtZBnW rV4e1Tv5T/1sAZtGwf1dewXwzAY3NQBTHRYCRKWD9l/Pyl96boariLsrrgsAsCMthrh+ perg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=dbUp97nMAfJPEEwmtIjAMFsS49UNI7EM1PidaU6Ju/k=; b=2WCJ/jx5cAowlqCxq9CcYZ4S1lNwur5kTcK/JwNM/mTSVnZraTYPdp83G1TUgGAAPE iUCVv57G1qvIREgfb4KOxWWczPq4I+f34Lb/DX4qRWSOkGj0d0+j1Ca4sLNlmbkS2QS4 +dV8veSyE1TTgGGqcY9eJaAVMOh+TJabBln6I6I5/2OzmlmjQMsGUi0dW+B1EZnX8r4w Sl9NUPW+0lWQWnJC55bzjudw8zlRnRAxlCr3a/wwU5GRIRfxM6tyOpYjj+QLFzy2XxUi OxsfJFs/iKbMOGvDYvjVkeJwILsSMArSSmEEq+z6znDfcfzOaolVsd3cJuvv5J3ile52 r3wg== X-Gm-Message-State: AOAM532flsADth25wXtyQNGjd4Drsl3+ZbwkYZJFVFltNutJdmobyCBT 3H9aHHx3JuZxXFAEPTT43woR5QWuw7mySA== X-Received: by 2002:a63:a804:: with SMTP id o4mr10967518pgf.309.1634337764035; Fri, 15 Oct 2021 15:42:44 -0700 (PDT) Received: from han1-NUC8i7BEH.hsd1.or.comcast.net ([2601:1c0:6a01:d830:7cf0:730:2c83:c489]) by smtp.gmail.com with ESMTPSA id c192sm5749770pfb.110.2021.10.15.15.42.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Oct 2021 15:42:43 -0700 (PDT) From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Subject: [RFC BlueZ PATCH v11 1/4] emulator: Add support to config the accept and resolve list Date: Fri, 15 Oct 2021 15:42:39 -0700 Message-Id: <20211015224242.351166-1-hj.tedd.an@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Tedd Ho-Jeong An This patch adds interfaces to config the accept list and resolve list in the btdev. --- emulator/btdev.c | 37 +++++++++++++++++++++++++++++-------- emulator/btdev.h | 4 ++++ emulator/hciemu.c | 16 ++++++++++++++++ emulator/hciemu.h | 4 ++++ 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/emulator/btdev.c b/emulator/btdev.c index 148e32b7d..2c199ed85 100644 --- a/emulator/btdev.c +++ b/emulator/btdev.c @@ -191,6 +191,10 @@ struct btdev { } __attribute__ ((packed)) le_cig; uint8_t le_iso_path[2]; + /* Real time length of AL array */ + uint8_t le_al_len; + /* Real time length of RL array */ + uint8_t le_rl_len; struct btdev_al le_al[AL_SIZE]; struct btdev_rl le_rl[RL_SIZE]; uint8_t le_rl_enable; @@ -475,6 +479,18 @@ static void rl_clear(struct btdev *dev) rl_reset(&dev->le_rl[i]); } +/* Set the real time length of AL array */ +void btdev_set_al_len(struct btdev *btdev, uint8_t len) +{ + btdev->le_al_len = len; +} + +/* Set the real time length of RL array */ +void btdev_set_rl_len(struct btdev *btdev, uint8_t len) +{ + btdev->le_rl_len = len; +} + static void btdev_reset(struct btdev *btdev) { /* FIXME: include here clearing of all states that should be @@ -486,6 +502,9 @@ static void btdev_reset(struct btdev *btdev) al_clear(btdev); rl_clear(btdev); + + btdev->le_al_len = AL_SIZE; + btdev->le_rl_len = RL_SIZE; } static int cmd_reset(struct btdev *dev, const void *data, uint8_t len) @@ -3571,7 +3590,7 @@ static int cmd_read_al_size(struct btdev *dev, const void *data, uint8_t len) struct bt_hci_rsp_le_read_accept_list_size rsp; rsp.status = BT_HCI_ERR_SUCCESS; - rsp.size = AL_SIZE; + rsp.size = dev->le_al_len; cmd_complete(dev, BT_HCI_CMD_LE_READ_ACCEPT_LIST_SIZE, &rsp, sizeof(rsp)); @@ -3658,7 +3677,7 @@ static int cmd_add_al(struct btdev *dev, const void *data, uint8_t len) if (cmd->addr_type > 0x01) return -EINVAL; - for (i = 0; i < AL_SIZE; i++) { + for (i = 0; i < dev->le_al_len; i++) { struct btdev_al *al = &dev->le_al[i]; if (AL_ADDR_EQUAL(al, cmd->addr_type, &cmd->addr)) { @@ -3709,7 +3728,7 @@ static int cmd_remove_al(struct btdev *dev, const void *data, uint8_t len) if (cmd->addr_type > 0x01) return -EINVAL; - for (i = 0; i < AL_SIZE; i++) { + for (i = 0; i < dev->le_al_len; i++) { struct btdev_al *al = &dev->le_al[i]; ba2str(&al->addr, addr); @@ -3724,7 +3743,7 @@ static int cmd_remove_al(struct btdev *dev, const void *data, uint8_t len) } } - if (i == AL_SIZE) + if (i == dev->le_al_len) return -EINVAL; status = BT_HCI_ERR_SUCCESS; @@ -3755,7 +3774,7 @@ static int cmd_add_rl(struct btdev *dev, const void *data, uint8_t len) if (cmd->addr_type > 0x01) return -EINVAL; - for (i = 0; i < RL_SIZE; i++) { + for (i = 0; i < dev->le_rl_len; i++) { struct btdev_rl *rl = &dev->le_rl[i]; if (RL_ADDR_EQUAL(rl, cmd->addr_type, &cmd->addr)) { @@ -3806,7 +3825,7 @@ static int cmd_remove_rl(struct btdev *dev, const void *data, uint8_t len) if (cmd->addr_type > 0x01) return -EINVAL; - for (i = 0; i < RL_SIZE; i++) { + for (i = 0; i < dev->le_rl_len; i++) { struct btdev_rl *rl = &dev->le_rl[i]; if (RL_ADDR_EQUAL(rl, cmd->addr_type, &cmd->addr)) { @@ -3815,7 +3834,7 @@ static int cmd_remove_rl(struct btdev *dev, const void *data, uint8_t len) } } - if (i == RL_SIZE) + if (i == dev->le_rl_len) return -EINVAL; status = BT_HCI_ERR_SUCCESS; @@ -3853,7 +3872,7 @@ static int cmd_read_rl_size(struct btdev *dev, const void *data, uint8_t len) struct bt_hci_rsp_le_read_resolv_list_size rsp; rsp.status = BT_HCI_ERR_SUCCESS; - rsp.size = RL_SIZE; + rsp.size = dev->le_rl_len; cmd_complete(dev, BT_HCI_CMD_LE_READ_RESOLV_LIST_SIZE, &rsp, sizeof(rsp)); @@ -6294,6 +6313,8 @@ struct btdev *btdev_create(enum btdev_type type, uint16_t id) btdev->conns = queue_new(); btdev->le_ext_adv = queue_new(); + btdev->le_al_len = AL_SIZE; + btdev->le_rl_len = RL_SIZE; return btdev; } diff --git a/emulator/btdev.h b/emulator/btdev.h index f7cba149a..cce49db3b 100644 --- a/emulator/btdev.h +++ b/emulator/btdev.h @@ -80,6 +80,10 @@ uint8_t btdev_get_le_scan_enable(struct btdev *btdev); void btdev_set_le_states(struct btdev *btdev, const uint8_t *le_states); +void btdev_set_al_len(struct btdev *btdev, uint8_t len); + +void btdev_set_rl_len(struct btdev *btdev, uint8_t len); + void btdev_set_command_handler(struct btdev *btdev, btdev_command_func handler, void *user_data); diff --git a/emulator/hciemu.c b/emulator/hciemu.c index bd6bf1e63..d18b3469b 100644 --- a/emulator/hciemu.c +++ b/emulator/hciemu.c @@ -581,6 +581,22 @@ void hciemu_set_central_le_states(struct hciemu *hciemu, btdev_set_le_states(hciemu->dev, le_states); } +void hciemu_set_central_le_al_len(struct hciemu *hciemu, uint8_t len) +{ + if (!hciemu || !hciemu->dev) + return; + + btdev_set_al_len(hciemu->dev, len); +} + +void hciemu_set_central_le_rl_len(struct hciemu *hciemu, uint8_t len) +{ + if (!hciemu || !hciemu->dev) + return; + + btdev_set_rl_len(hciemu->dev, len); +} + bool hciemu_add_central_post_command_hook(struct hciemu *hciemu, hciemu_command_func_t function, void *user_data) { diff --git a/emulator/hciemu.h b/emulator/hciemu.h index 3d3d93b4b..73a90c1e6 100644 --- a/emulator/hciemu.h +++ b/emulator/hciemu.h @@ -60,6 +60,10 @@ uint8_t hciemu_get_central_le_scan_enable(struct hciemu *hciemu); void hciemu_set_central_le_states(struct hciemu *hciemu, const uint8_t *le_states); +void hciemu_set_central_le_al_len(struct hciemu *hciemu, uint8_t len); + +void hciemu_set_central_le_rl_len(struct hciemu *hciemu, uint8_t len); + typedef void (*hciemu_command_func_t)(uint16_t opcode, const void *data, uint8_t len, void *user_data); -- 2.25.1