michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Fix PB GATT adv name

Browse source 
Fixes issue where PB GATT Server will drop
advertising device name if optional provisioning
URI is not provided.

Signed-off-by: Anders Storrø <anders.storro@nordicsemi.no>
This commit is contained in:
Anders Storrø 2024-05-30 15:56:05 +02:00 • committed by Carles Cufí
commit cee8080117
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -226,26 +226,27 @@ static size_t gatt_prov_adv_create(struct bt_data prov_sd[2])
sys_put_be16(prov->oob_info, prov_svc_data + 18);
if (!prov->uri) {
return 0;
goto dev_name;
}
uri_len = strlen(prov->uri);
if (uri_len > 29) {
/* There's no way to shorten an URI */
LOG_WRN("Too long URI to fit advertising packet");
return 0;
goto dev_name;
}
prov_sd[0].type = BT_DATA_URI;
prov_sd[0].data_len = uri_len;
prov_sd[0].data = (const uint8_t *)prov->uri;
prov_sd[prov_sd_len].type = BT_DATA_URI;
prov_sd[prov_sd_len].data_len = uri_len;
prov_sd[prov_sd_len].data = (const uint8_t *)prov->uri;
prov_sd_len += 1;
dev_name:
#if defined(CONFIG_BT_MESH_PB_GATT_USE_DEVICE_NAME)
prov_sd[1].type = BT_DATA_NAME_COMPLETE;
prov_sd[1].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
prov_sd[1].data = CONFIG_BT_DEVICE_NAME;
prov_sd[prov_sd_len].type = BT_DATA_NAME_COMPLETE;
prov_sd[prov_sd_len].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
prov_sd[prov_sd_len].data = CONFIG_BT_DEVICE_NAME;
prov_sd_len += 1;
#endif