michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Use NRPA for private proxy advertisements

Browse source 
According to sections 7.2.2.2.4 and 7.2.2.2.5 of MshPRTd1.1v20,
when starting Private Node Identity or Private Network Identity, the
node shall use either RPA or NRPA and the advertising address. The
address shall be regenerated when Random field is regenerated.

Use BT_LE_ADV_OPT_USE_NRPA options to make advertiser generate and use
NRPA on every start of advertising Private Node Identity or Private
Network Identity.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
This commit is contained in:
Pavel Vasilyev 2023-07-17 17:19:34 +02:00 • committed by Fabio Baltieri
commit 9122c514ab
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
subsys/bluetooth/mesh/proxy_srv.c
View file

@ -48,10 +48,11 @@ LOG_MODULE_REGISTER(bt_mesh_gatt);
#define ADV_OPT_USE_NAME 0
#endif
#define ADV_OPT_PROXY \
(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_SCANNABLE | \
BT_LE_ADV_OPT_ONE_TIME | ADV_OPT_USE_IDENTITY | \
ADV_OPT_USE_NAME)
#define ADV_OPT_USE_NRPA(private) ((private) ? BT_LE_ADV_OPT_USE_NRPA : 0)
#define ADV_OPT_PROXY(private) \
(BT_LE_ADV_OPT_CONNECTABLE | BT_LE_ADV_OPT_SCANNABLE | ADV_OPT_USE_NRPA(private) | \
BT_LE_ADV_OPT_ONE_TIME | ADV_OPT_USE_IDENTITY | ADV_OPT_USE_NAME)
static void proxy_send_beacons(struct k_work *work);
static int proxy_send(struct bt_conn *conn,
@ -496,12 +497,14 @@ static int enc_id_adv(struct bt_mesh_subnet *sub, uint8_t type,
{
struct bt_le_adv_param slow_adv_param = {
.id = BT_ID_DEFAULT,
.options = ADV_OPT_PROXY,
.options = ADV_OPT_PROXY(type == BT_MESH_ID_TYPE_PRIV_NET ||
type == BT_MESH_ID_TYPE_PRIV_NODE),
ADV_SLOW_INT,
};
struct bt_le_adv_param fast_adv_param = {
.id = BT_ID_DEFAULT,
.options = ADV_OPT_PROXY,
.options = ADV_OPT_PROXY(type == BT_MESH_ID_TYPE_PRIV_NET ||
type == BT_MESH_ID_TYPE_PRIV_NODE),
ADV_FAST_INT,
};
int err;
@ -598,7 +601,7 @@ static int net_id_adv(struct bt_mesh_subnet *sub, int32_t duration)
{
struct bt_le_adv_param slow_adv_param = {
.id = BT_ID_DEFAULT,
.options = ADV_OPT_PROXY,
.options = ADV_OPT_PROXY(false),
ADV_SLOW_INT,
};
int err;