michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Mesh: Reflact disconnect logic to separate roles

Browse source 
remove section ordering to use code more readable.

Signed-off-by: Lingao Meng <menglingao@xiaomi.com>
This commit is contained in:
Lingao Meng 2021-09-03 13:59:37 +08:00 • committed by Christopher Friedt
commit 3f68692069
2 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -861,8 +861,12 @@ static void gatt_disconnected(struct bt_conn *conn, uint8_t reason)
struct bt_mesh_proxy_client *client;
bt_conn_get_info(conn, &info);
if (info.role != BT_CONN_ROLE_PERIPHERAL ||
!service_registered) {
if (info.role != BT_CONN_ROLE_PERIPHERAL) {
return;
}
if (!service_registered && bt_mesh_is_provisioned()) {
(void)bt_mesh_proxy_gatt_enable();
return;
}
@ -900,10 +904,7 @@ int bt_mesh_proxy_adv_start(void)
return gatt_proxy_advertise(next_sub());
}
/* Add `_1` suffix forces proxy conn_cb to precede pb_gatt conn_cb.
* As we may register proxy services in pb_gatt disconnect cb.
*/
BT_CONN_CB_DEFINE(conn_callbacks_1) = {
BT_CONN_CB_DEFINE(conn_callbacks) = {
.connected = gatt_connected,
.disconnected = gatt_disconnected,
};