michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Don't process PRB when mesh-1.1 disabled

Browse source 
Private Beacons are mesh-1.1 feature and without mesh-1.1 spec enabled,
the node shall not process such beacons.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
This commit is contained in:
Pavel Vasilyev 2023-03-30 16:51:11 +02:00 • committed by Carles Cufí
commit 95d6e66ec3
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
subsys/bluetooth/mesh/beacon.c
View file

@ -509,6 +509,7 @@ static bool secure_beacon_authenticate(struct bt_mesh_subnet *sub, void *cb_data
return false;
}
#if defined(CONFIG_BT_MESH_V1d1)
static bool priv_beacon_decrypt(struct bt_mesh_subnet *sub, void *cb_data)
{
struct beacon_params *params = cb_data;
@ -532,6 +533,7 @@ static bool priv_beacon_decrypt(struct bt_mesh_subnet *sub, void *cb_data)
return false;
}
#endif
static void net_beacon_register(struct bt_mesh_beacon *beacon, bool priv)
{
@ -622,6 +624,7 @@ static void secure_beacon_recv(struct net_buf_simple *buf)
net_beacon_resolve(&params, secure_beacon_authenticate);
}
#if defined(CONFIG_BT_MESH_V1d1)
static void private_beacon_recv(struct net_buf_simple *buf)
{
struct beacon_params params;
@ -638,6 +641,7 @@ static void private_beacon_recv(struct net_buf_simple *buf)
net_beacon_resolve(&params, priv_beacon_decrypt);
}
#endif
void bt_mesh_beacon_recv(struct net_buf_simple *buf)
{
@ -661,7 +665,9 @@ void bt_mesh_beacon_recv(struct net_buf_simple *buf)
secure_beacon_recv(buf);
break;
case BEACON_TYPE_PRIVATE:
#if defined(CONFIG_BT_MESH_V1d1)
private_beacon_recv(buf);
#endif
break;
default:
LOG_WRN("Unknown beacon type 0x%02x", type);

2
subsys/bluetooth/mesh/subnet.h
View file

@ -75,7 +75,9 @@ struct bt_mesh_subnet {
uint8_t identity[16]; /* IdentityKey */
#endif
uint8_t beacon[16]; /* BeaconKey */
#if defined(CONFIG_BT_MESH_V1d1)
uint8_t priv_beacon[16]; /* PrivateBeaconKey */
#endif
} keys[2];
#if defined(CONFIG_BT_MESH_PROXY_SOLICITATION)
bool sol_tx;