From cd19f6faf1d55aadc05304b51d0ef13a08d46c80 Mon Sep 17 00:00:00 2001 From: lly Date: Wed, 25 Mar 2020 16:31:47 +0800 Subject: [PATCH] ble_mesh: Check device uuid when init provisioning --- components/bt/esp_ble_mesh/mesh_core/prov.c | 2 ++ components/bt/esp_ble_mesh/mesh_core/proxy_server.c | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/components/bt/esp_ble_mesh/mesh_core/prov.c b/components/bt/esp_ble_mesh/mesh_core/prov.c index bc36a6efba..8f624cd0a7 100644 --- a/components/bt/esp_ble_mesh/mesh_core/prov.c +++ b/components/bt/esp_ble_mesh/mesh_core/prov.c @@ -1750,6 +1750,8 @@ int bt_mesh_prov_init(const struct bt_mesh_prov *prov_info) return -EINVAL; } + __ASSERT(prov_info->uuid, "%s, Device UUID is not initialized", __func__); + /* Changed by Espressif. Use micro-ecc to generate public key now. */ key = bt_mesh_pub_key_get(); if (!key) { diff --git a/components/bt/esp_ble_mesh/mesh_core/proxy_server.c b/components/bt/esp_ble_mesh/mesh_core/proxy_server.c index 72e443a90b..914b80f7c2 100644 --- a/components/bt/esp_ble_mesh/mesh_core/proxy_server.c +++ b/components/bt/esp_ble_mesh/mesh_core/proxy_server.c @@ -1420,11 +1420,6 @@ int bt_mesh_proxy_init(void) bt_mesh_gatts_conn_cb_register(&conn_callbacks); -#if defined(CONFIG_BLE_MESH_PB_GATT) - const struct bt_mesh_prov *prov = bt_mesh_prov_get(); - __ASSERT(prov && prov->uuid, "%s, Device UUID is not initialized", __func__); -#endif - return bt_mesh_gatts_set_local_device_name(device_name); }