michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: tester: fix bt_le_oob_set_legacy_tk excluded when supported

Browse source 
Fix bt_le_oob_set_legacy_tk excluded when Legacy OOB pairing is
supported. We still support legacy OOB when
CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY is not defined.
It is only when we disable Legacy pairing that it is not included.

Check that the OOB data type is in fact Legacy OOB before calling
bt_le_oob_set_legacy_tk.

Log an error if the OOB type was not handled by the callback.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2021-04-30 11:30:08 +02:00 • committed by Carles Cufí
commit de60823d9a
1 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/bluetooth/tester/src/gap.c
View file

@ -235,8 +235,10 @@ static void oob_data_request(struct bt_conn *conn,
bt_addr_le_to_str(info.le.dst, addr, sizeof(addr));
switch (oob_info->type) {
#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)
if (oob_info->type == BT_CONN_OOB_LE_SC) {
case BT_CONN_OOB_LE_SC:
{
LOG_DBG("Set %s OOB SC data for %s, ",
oob_config_str(oob_info->lesc.oob_config),
log_strdup(addr));
@ -272,17 +274,25 @@ static void oob_data_request(struct bt_conn *conn,
LOG_DBG("bt_le_oob_set_sc_data failed with: %d", err);
}
return;
break;
}
#else /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
#endif /* !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY) */
LOG_DBG("Legacy OOB TK requested from remote %s", log_strdup(addr));
#if !defined(CONFIG_BT_SMP_SC_PAIR_ONLY)
case BT_CONN_OOB_LE_LEGACY:
LOG_DBG("Legacy OOB TK requested from remote %s", log_strdup(addr));
err = bt_le_oob_set_legacy_tk(conn, oob_legacy_tk);
if (err < 0) {
LOG_ERR("Failed to set OOB Temp Key: %d", err);
err = bt_le_oob_set_legacy_tk(conn, oob_legacy_tk);
if (err < 0) {
LOG_ERR("Failed to set OOB TK: %d", err);
}
break;
#endif /* !defined(CONFIG_BT_SMP_SC_PAIR_ONLY) */
default:
LOG_ERR("Unhandled OOB type %d", oob_info->type);
break;
}
#endif
}
#if !defined(CONFIG_BT_SMP_OOB_LEGACY_PAIR_ONLY)