michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Fix registering GATT Proxy service after reboot

Browse source 
After commit 3486f133e9
GATT Proxy service registration is broken because it is registered from
settings_load() in mesh_commit(). Because mesh_commit() is called before
sc_commit() is called in gatt.c, bt_gatt_service_register() can't be
called yet.

Use k_work to postpone the service registration.

Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>
This commit is contained in:
Pavel Vasilyev 2023-03-16 16:29:08 +01:00 • committed by Carles Cufí
commit cf5ea49d23
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -875,10 +875,24 @@ static struct bt_gatt_attr proxy_attrs[] = {
static struct bt_gatt_service proxy_svc = BT_GATT_SERVICE(proxy_attrs);
static void svc_reg_work_handler(struct k_work *work)
{
(void)bt_gatt_service_register(&proxy_svc);
service_registered = true;
for (int i = 0; i < ARRAY_SIZE(clients); i++) {
if (clients[i].cli) {
clients[i].filter_type = ACCEPT;
}
}
bt_mesh_adv_gatt_update();
}
static struct k_work svc_reg_work = Z_WORK_INITIALIZER(svc_reg_work_handler);
int bt_mesh_proxy_gatt_enable(void)
{
int i;
LOG_DBG("");
if (!bt_mesh_is_provisioned()) {
@ -889,16 +903,7 @@ int bt_mesh_proxy_gatt_enable(void)
return -EBUSY;
}
(void)bt_gatt_service_register(&proxy_svc);
service_registered = true;
for (i = 0; i < ARRAY_SIZE(clients); i++) {
if (clients[i].cli) {
clients[i].filter_type = ACCEPT;
}
}
return 0;
return k_work_submit(&svc_reg_work);
}
void bt_mesh_proxy_gatt_disconnect(void)