michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: tester: Add command pair_v2 for BTP GAP

Browse source 
Compare with BTP GAP pair, the pair_v2 add more arguments, including
security mode, security level, and flags.

The argument `security mode` is used to set the security mode.

The argument `security level` is used to set the security level of the
specific security mode.

The argument `flags` is used to add additional setting, such as flag
`BTP_GAP_PAIR_V2_FLAG_FORCE_PAIR` is used to force the pairing
procedure.

Signed-off-by: Lyle Zhu <lyle.zhu@nxp.com>
This commit is contained in:
Lyle Zhu 2025-03-05 17:00:40 +08:00 • committed by Benjamin Cabé
commit 81b8f8d265
2 changed files with 72 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tests/bluetooth/tester/src/btp/btp_gap.h
View file

@ -319,6 +319,29 @@ struct btp_gap_padv_sync_transfer_recv_cmd {
uint8_t flags; uint8_t flags;
} __packed; } __packed;
#define BTP_GAP_PAIR_V2_MODE_1 0x01
#define BTP_GAP_PAIR_V2_MODE_2 0x02
#define BTP_GAP_PAIR_V2_MODE_3 0x03
#define BTP_GAP_PAIR_V2_MODE_4 0x04
#define BTP_GAP_PAIR_V2_MODE_ANY 0xFF
#define BTP_GAP_PAIR_V2_LEVEL_0 0x00
#define BTP_GAP_PAIR_V2_LEVEL_1 0x01
#define BTP_GAP_PAIR_V2_LEVEL_2 0x02
#define BTP_GAP_PAIR_V2_LEVEL_3 0x03
#define BTP_GAP_PAIR_V2_LEVEL_4 0x04
#define BTP_GAP_PAIR_V2_LEVEL_ANY 0xFF
#define BTP_GAP_PAIR_V2_FLAG_FORCE_PAIR BIT(0)
#define BTP_GAP_PAIR_V2 0x2A
struct btp_gap_pair_v2_cmd {
bt_addr_le_t address;
uint8_t mode;
uint8_t level;
uint8_t flags;
} __packed;
#define BTP_GAP_SET_RPA_TIMEOUT 0x30 #define BTP_GAP_SET_RPA_TIMEOUT 0x30
struct btp_gap_set_rpa_timeout_cmd { struct btp_gap_set_rpa_timeout_cmd {
uint16_t rpa_timeout; uint16_t rpa_timeout;

49
tests/bluetooth/tester/src/btp_gap.c
View file

@ -1577,6 +1577,50 @@ static uint8_t pair(const void *cmd, uint16_t cmd_len,
return BTP_STATUS_SUCCESS; return BTP_STATUS_SUCCESS;
} }
static uint8_t pair_v2(const void *cmd, uint16_t cmd_len, void *rsp, uint16_t *rsp_len)
{
const struct btp_gap_pair_v2_cmd *cp = cmd;
struct bt_conn *conn;
bt_security_t level;
int err;
/* TODO: Only supports mode 4 */
if ((cp->mode != BTP_GAP_PAIR_V2_MODE_4) && (cp->mode != BTP_GAP_PAIR_V2_MODE_ANY)) {
LOG_WRN("Unsupport mode %d", cp->mode);
return BTP_STATUS_FAILED;
}
if (cp->address.type == BTP_BR_ADDRESS_TYPE) {
if (IS_ENABLED(CONFIG_BT_CLASSIC)) {
conn = bt_conn_lookup_addr_br(&cp->address.a);
} else {
return BTP_STATUS_FAILED;
}
} else {
conn = bt_conn_lookup_addr_le(BT_ID_DEFAULT, &cp->address);
}
if (conn == NULL) {
LOG_ERR("Unknown connection");
return BTP_STATUS_FAILED;
}
level = (bt_security_t)cp->level;
if (cp->flags & BTP_GAP_PAIR_V2_FLAG_FORCE_PAIR) {
level = (bt_security_t)((uint8_t)level | BT_SECURITY_FORCE_PAIR);
}
err = bt_conn_set_security(conn, level);
if (err < 0) {
LOG_ERR("Failed to set security: %d", err);
bt_conn_unref(conn);
return BTP_STATUS_FAILED;
}
bt_conn_unref(conn);
return BTP_STATUS_SUCCESS;
}
static uint8_t unpair(const void *cmd, uint16_t cmd_len, static uint8_t unpair(const void *cmd, uint16_t cmd_len,
void *rsp, uint16_t *rsp_len) void *rsp, uint16_t *rsp_len)
{ {
@ -2208,6 +2252,11 @@ static const struct btp_handler handlers[] = {
.expect_len = sizeof(struct btp_gap_pair_cmd), .expect_len = sizeof(struct btp_gap_pair_cmd),
.func = pair, .func = pair,
}, },
{
.opcode = BTP_GAP_PAIR_V2,
.expect_len = sizeof(struct btp_gap_pair_v2_cmd),
.func = pair_v2,
},
{ {
.opcode = BTP_GAP_UNPAIR, .opcode = BTP_GAP_UNPAIR,
.expect_len = sizeof(struct btp_gap_unpair_cmd), .expect_len = sizeof(struct btp_gap_unpair_cmd),