Skip to content

Commit

Permalink
Merge branch 'bugfix/IDFGH-9552' into 'master'
Browse files Browse the repository at this point in the history
NimBLE : Added configurable option for resolving peer address in bleprph example.

Closes IDFGH-9552

See merge request espressif/esp-idf!22834
  • Loading branch information
IshaESP committed Mar 21, 2023
2 parents bdf8f1c + 906edee commit 720af16
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
7 changes: 7 additions & 0 deletions examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,11 @@ menu "Example Configuration"
prompt "Enable Link Encryption"
help
This adds Encrypted Read and Write permissions in the custom GATT server.

config EXAMPLE_RESOLVE_PEER_ADDR
bool
prompt "Enable resolving peer address"
help
Use this option to enable resolving peer's address.

endmenu
16 changes: 9 additions & 7 deletions examples/bluetooth/nimble/bleprph/main/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,11 @@ app_main(void)
ble_hs_cfg.sm_io_cap = CONFIG_EXAMPLE_IO_TYPE;
#ifdef CONFIG_EXAMPLE_BONDING
ble_hs_cfg.sm_bonding = 1;
/* Enable the appropriate bit masks to make sure the keys
* that are needed are exchanged
*/
ble_hs_cfg.sm_our_key_dist |= BLE_SM_PAIR_KEY_DIST_ENC;
ble_hs_cfg.sm_their_key_dist |= BLE_SM_PAIR_KEY_DIST_ENC;
#endif
#ifdef CONFIG_EXAMPLE_MITM
ble_hs_cfg.sm_mitm = 1;
Expand All @@ -548,15 +553,12 @@ app_main(void)
#else
ble_hs_cfg.sm_sc = 0;
#endif
#ifdef CONFIG_EXAMPLE_BONDING
/* Enable the appropriate bit masks to make sure the keys
* that are needed are exchanged
*/
ble_hs_cfg.sm_our_key_dist = BLE_SM_PAIR_KEY_DIST_ENC;
ble_hs_cfg.sm_their_key_dist = BLE_SM_PAIR_KEY_DIST_ENC;
#ifdef CONFIG_EXAMPLE_RESOLVE_PEER_ADDR
/* Stores the IRK */
ble_hs_cfg.sm_our_key_dist |= BLE_SM_PAIR_KEY_DIST_ID;
ble_hs_cfg.sm_their_key_dist |= BLE_SM_PAIR_KEY_DIST_ID;
#endif


rc = gatt_svr_init();
assert(rc == 0);

Expand Down

0 comments on commit 720af16

Please sign in to comment.