michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Remove redundant BT_DEV_ID_STATIC_RANDOM flag

Browse source 
This flag was both redundant and creates confusion with potentially
multiple identity addresses (it was only referring to the first
identity address). We can simply just look at the type of the identity
address wanting to be used.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2018-07-16 10:50:42 +03:00 • committed by Johan Hedberg
commit 3ed01b48b9
3 changed files with 15 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

35
subsys/bluetooth/host/hci_core.c
View file

@ -1232,15 +1232,17 @@ static void check_pending_conn(const bt_addr_le_t *id_addr,
bt_addr_le_copy(&conn->le.init_addr, &bt_dev.random_addr);
} else {
const bt_addr_le_t *addr = &bt_dev.id_addr[conn->id];
/* If Static Random address is used as Identity address we
* need to restore it before creating connection. Otherwise
* NRPA used for active scan could be used for connection.
*/
if (atomic_test_bit(bt_dev.flags, BT_DEV_ID_STATIC_RANDOM)) {
set_random_address(&bt_dev.id_addr[conn->id].a);
if (addr->type == BT_ADDR_LE_RANDOM) {
set_random_address(&addr->a);
}
bt_addr_le_copy(&conn->le.init_addr, &bt_dev.id_addr[conn->id]);
bt_addr_le_copy(&conn->le.init_addr, addr);
}
bt_addr_le_copy(&conn->le.resp_addr, addr);
@ -4191,24 +4193,14 @@ int bt_addr_le_create_static(bt_addr_le_t *addr)
return 0;
}
int bt_set_static_addr(void)
int bt_set_static_addr(const bt_addr_le_t *addr)
{
int err;
if (bt_dev.id_addr[0].type != BT_ADDR_LE_RANDOM ||
(bt_dev.id_addr[0].a.val[5] & 0xc0) != 0xc0) {
if (addr->type != BT_ADDR_LE_RANDOM || !BT_ADDR_IS_STATIC(&addr->a)) {
BT_ERR("Only static random address supported as identity");
return -EINVAL;
}
err = set_random_address(&bt_dev.id_addr[0].a);
if (err) {
return err;
}
atomic_set_bit(bt_dev.flags, BT_DEV_ID_STATIC_RANDOM);
return 0;
return set_random_address(&addr->a);
}
static int setup_id_addr(void)
@ -4242,7 +4234,7 @@ static int setup_id_addr(void)
net_buf_unref(rsp);
if (bt_dev.id_count) {
return bt_set_static_addr();
return bt_set_static_addr(&bt_dev.id_addr[0]);
}
BT_WARN("No static addresses stored in controller");
@ -4266,7 +4258,7 @@ generate:
BT_WARN("Using temporary static random address %s",
bt_addr_str(&bt_dev.id_addr[0].a));
return bt_set_static_addr();
return bt_set_static_addr(&bt_dev.id_addr[0]);
}
}
@ -4887,7 +4879,6 @@ int bt_id_create(bt_addr_le_t *addr, u8_t *irk)
new_id = bt_dev.id_count++;
if (new_id == BT_ID_DEFAULT) {
atomic_set_bit(bt_dev.flags, BT_DEV_USER_ID_ADDR);
atomic_set_bit(bt_dev.flags, BT_DEV_ID_STATIC_RANDOM);
}
if (bt_addr_le_cmp(addr, BT_ADDR_LE_ANY)) {
@ -5054,8 +5045,7 @@ int bt_le_adv_start(const struct bt_le_adv_param *param,
* is enabled. Otherwise NRPA used for active scan
* could be used for advertising.
*/
if (atomic_test_bit(bt_dev.flags,
BT_DEV_ID_STATIC_RANDOM)) {
if (id_addr->type == BT_ADDR_LE_RANDOM) {
set_random_address(&id_addr->a);
}
@ -5065,8 +5055,7 @@ int bt_le_adv_start(const struct bt_le_adv_param *param,
set_param.type = BT_LE_ADV_IND;
} else {
if (param->options & BT_LE_ADV_OPT_USE_IDENTITY) {
if (atomic_test_bit(bt_dev.flags,
BT_DEV_ID_STATIC_RANDOM)) {
if (id_addr->type == BT_ADDR_LE_RANDOM) {
err = set_random_address(&id_addr->a);
}

6
subsys/bluetooth/host/hci_core.h
View file

@ -30,7 +30,6 @@ enum {
enum {
BT_DEV_ENABLE,
BT_DEV_READY,
BT_DEV_ID_STATIC_RANDOM,
BT_DEV_USER_ID_ADDR,
BT_DEV_HAS_PUB_KEY,
BT_DEV_PUB_KEY_BUSY,
@ -59,8 +58,7 @@ enum {
/* Flags which should not be cleared upon HCI_Reset */
#define BT_DEV_PERSISTENT_FLAGS (BIT(BT_DEV_ENABLE) | \
BIT(BT_DEV_USER_ID_ADDR) | \
BIT(BT_DEV_ID_STATIC_RANDOM))
BIT(BT_DEV_USER_ID_ADDR))
struct bt_dev_le {
/* LE features */
@ -195,6 +193,6 @@ struct bt_keys;
int bt_id_add(struct bt_keys *keys);
int bt_id_del(struct bt_keys *keys);
int bt_set_static_addr(void);
int bt_set_static_addr(const bt_addr_le_t *addr);
void bt_dev_show_info(void);

2
subsys/bluetooth/host/settings.c
View file

@ -169,7 +169,7 @@ static void generate_static_addr(void)
}
bt_dev.id_count = 1;
bt_set_static_addr();
bt_set_static_addr(&bt_dev.id_addr[0]);
BT_DBG("New ID Addr: %s", bt_addr_le_str(&bt_dev.id_addr[0]));