espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-21 08:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #646 from michal-narajowski/mesh-init-fix

Browse Source 
mesh: Fail init on keys generation error

X-Original-Commit: e600ad00cb19307eca7bd9e1788bba35a7f9432a
This commit is contained in:
Michał Narajowski
2017-11-09 09:26:46 +01:00
committed by GitHub
parent a7037da4ef 44d5c462d5
commit c55b6c2e5f
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/mesh/src/mesh.c
+5 -1
View File
@@ -173,7 +173,11 @@ bt_mesh_init(uint8_t own_addr_type, const struct bt_mesh_prov *prov,
}
if (MYNEWT_VAL(BLE_MESH_PROV)) {
bt_mesh_prov_init(prov);
err = bt_mesh_prov_init(prov);
if (err) {
return err;
}
}
#if (MYNEWT_VAL(BLE_MESH_PROXY))
nimble/host/mesh/src/prov.c
+8 -3
View File
@@ -1502,8 +1502,9 @@ bool bt_prov_active(void)
return atomic_test_bit(link.flags, LINK_ACTIVE);
}
void bt_mesh_prov_init(const struct bt_mesh_prov *prov_info)
int bt_mesh_prov_init(const struct bt_mesh_prov *prov_info)
{
int err;
static struct bt_pub_key_cb pub_key_cb = {
.func = pub_key_ready,
};
@@ -1512,8 +1513,10 @@ void bt_mesh_prov_init(const struct bt_mesh_prov *prov_info)
#endif
if (bt_pub_key_gen(&pub_key_cb)) {
BT_ERR("Failed to generate public key");
err = bt_pub_key_gen(&pub_key_cb);
if (err) {
BT_ERR("Failed to generate public key (%d)", err);
return err;
}
prov = prov_info;
@@ -1530,6 +1533,8 @@ void bt_mesh_prov_init(const struct bt_mesh_prov *prov_info)
#endif
#endif /* MYNEWT_VAL(BLE_MESH_PB_ADV) */
return 0;
}
void bt_mesh_prov_reset_link(void) {
nimble/host/mesh/src/prov.h
+1 -1
View File
@@ -29,7 +29,7 @@ bt_mesh_pb_gatt_recv(uint16_t conn_handle, struct os_mbuf *buf);
const u8_t *
bt_mesh_prov_get_uuid(void);
void
int
bt_mesh_prov_init(const struct bt_mesh_prov *prov);
void