Update core to esp-nimble commit 95bd864.

Author: h2zero

README.md

@@ -1,7 +1,7 @@
 # NimBLE-Arduino
 A fork of the NimBLE stack restructured for compilation in the Ardruino IDE with a CPP library for use with ESP32.  
 
-**Note for IDF users: An ESP-IDF component version of this library can be [found here](https://github.com/h2zero/esp-nimble-cpp), this will not compile correctly in ESP-IDF**.
+**Note for IDF users: This repo will not compile correctly in ESP-IDF. An ESP-IDF component version of this library can be [found here.](https://github.com/h2zero/esp-nimble-cpp)**
 
 This library **significantly** reduces resource usage and improves performance for ESP32 BLE applications as compared    
 with the bluedroid based library. The goal is to maintain, as much as reasonable, compatibility with the original   
@@ -53,10 +53,25 @@ More advanced examples highlighting many available features are in examples/ Nim
 Beacon examples provided by @beegee-tokyo are in examples/ BLE_Beacon_Scanner, BLE_EddystoneTLM_Beacon, BLE_EddystoneURL_Beacon.   
 
 Change the settings in the `nimconfig.h` file to customize NimBLE to your project, such as increasing max connections, default is 3.  
+
+**Note To increase max connections in Arduino it is also required to change the controller max connections defined in sdkconfig.h.**  
+
+This is located in your Arduino/hardware/espressif/esp32/tools/sdk/include/config folder.
+
+The values in `sdkconfig.h` you will need to change are:  
+```
+#define CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN 3
+#define CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF 3
+```
+In `nimconfig.h` the value is:  
+```
+#define CONFIG_BT_NIMBLE_MAX_CONNECTIONS 3
+```
+Espressif has stated the hard maximum connections is 9.  
 <br/>
 
 # Continuing development
-This Library is tracking the esp-nimble repo, nimble-1.2.0-idf master branch, currently [@46c1d9f.](https://github.com/espressif/esp-nimble)  
+This Library is tracking the esp-nimble repo, nimble-1.2.0-idf master branch, currently [@95bd864.](https://github.com/espressif/esp-nimble)  
 
 Also tracking the NimBLE related changes in ESP-IDF, master branch, currently [@2ef4890.](https://github.com/espressif/esp-idf/tree/master/components/bt/host/nimble)  
 <br/>
@@ -68,9 +83,7 @@ Also tracking the NimBLE related changes in ESP-IDF, master branch, currently [@
 <br/>  
 
 # Todo
-1. Implement random addresses.
-2. Implement NimBLEServer::removeService
-3. Implement extra fields in NimBLEAdvertisedDevice.
-4. Document nimconfig.
-5. Add BLE Mesh code.  
+1. Document nimconfig.
+2. Examples.
+3. Improve documentation. 
 <br/>  

docs/index.md

@@ -48,14 +48,29 @@ See: [Breaking API Changes vs Original](docs/BREAKING_API_CHANGES.md) for detail
 
 Also see [Improvements_and_updates](docs/Improvements_and_updates.md) for information about non-breaking changes.  
 
-### Arduino
-    See the Refactored_original_examples in the examples folder for highlights of the differences with the original library.  
+### Arduino specific:
+See the Refactored_original_examples in the examples folder for highlights of the differences with the original library.  
 
-    More advanced examples highlighting many available features are in examples/NimBLE_Server, NimBLE_Client.  
+More advanced examples highlighting many available features are in examples/NimBLE_Server, NimBLE_Client.  
 
-    Beacon examples provided by [beegee-tokyo](https://github.com/beegee-tokyo) are in examples/BLE_Beacon_Scanner, BLE_EddystoneTLM_Beacon, BLE_EddystoneURL_Beacon.  
+Beacon examples provided by [beegee-tokyo](https://github.com/beegee-tokyo) are in examples/BLE_Beacon_Scanner, BLE_EddystoneTLM_Beacon, BLE_EddystoneURL_Beacon.  
 
-    Change the settings in the nimconfig.h file to customize NimBLE to your project, such as increasing max connections (default == 3).  
+Change the settings in the nimconfig.h file to customize NimBLE to your project, such as increasing max connections (default == 3).  
+
+**Note To increase max connections in Arduino it is also required to change the controller max connections defined in sdkconfig.h.**  
+
+This is located in your Arduino/hardware/espressif/esp32/tools/sdk/include/config folder.
+
+The values in `sdkconfig.h` you will need to change are:  
+```
+#define CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN 3  
+#define CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF 3  
+```
+In `nimconfig.h` the value is:  
+```
+#define CONFIG_BT_NIMBLE_MAX_CONNECTIONS 3  
+```
+Espressif has stated the hard maximum connections is 9.  
 <br/>  
 
 # Acknowledgments

src/nimble/host/mesh/src/src/ble_hs_resolv_priv.h

@@ -53,6 +53,7 @@ struct ble_hs_peer_sec {
  */
 struct ble_hs_dev_records {
     bool rec_used;
+    uint8_t rand_addr_type;
     uint8_t pseudo_addr[BLE_DEV_ADDR_LEN];
     uint8_t rand_addr[BLE_DEV_ADDR_LEN];
     uint8_t identity_addr[BLE_DEV_ADDR_LEN];

src/nimble/host/src/ble_hs_resolv.c

@@ -181,6 +181,44 @@ is_rpa_resolvable_by_peer_rec(struct ble_hs_dev_records *p_dev_rec, uint8_t *pee
     return false;
 }
 
+static void
+ble_rpa_replace_id_with_rand_addr(uint8_t *addr_type, uint8_t *peer_addr)
+{
+    struct ble_hs_dev_records *p_dev_rec;
+    ble_addr_t p_addr = {0};
+    struct ble_hs_conn *conn = NULL;
+
+    p_dev_rec = ble_rpa_find_peer_dev_rec(peer_addr);
+
+    if (p_dev_rec != NULL) {
+        if (memcmp(p_dev_rec->rand_addr, p_dev_rec->identity_addr, BLE_DEV_ADDR_LEN)) {
+            /* OTA address (before resolving) gets saved in RAND_ADDR when the peer
+             * record is fetched from resolving list. Replace peer address
+             * with rand_addr to maintain status quo for new pairing/encryption request. */
+            p_addr.type = *addr_type;
+            memcpy(&p_addr.val[0], peer_addr, BLE_DEV_ADDR_LEN);
+
+            ble_hs_lock();
+
+            conn = ble_hs_conn_find_by_addr(&p_addr);
+            /* Rewrite the peer address history in ble_hs_conn. Need to take
+             * this step to avoid taking wrong address during re-pairing
+             * process  */
+            if (conn != NULL) {
+                conn->bhc_peer_rpa_addr.type = p_dev_rec->rand_addr_type;
+                memcpy(&conn->bhc_peer_rpa_addr.val[0], p_dev_rec->rand_addr, BLE_DEV_ADDR_LEN);
+                conn->bhc_peer_addr.type = p_dev_rec->rand_addr_type;
+                memcpy(&conn->bhc_peer_addr.val[0], p_dev_rec->rand_addr, BLE_DEV_ADDR_LEN);
+                BLE_HS_LOG(DEBUG, "\n Replace Identity addr with random addr received at"
+                                  " start of the connection\n");
+            }
+
+            ble_hs_unlock();
+        }
+    }
+    return;
+}
+
 /* Add peer to peer device records.
  *
  * @return 0                    if added successfully,
@@ -227,6 +265,7 @@ ble_rpa_find_rl_from_peer_records(uint8_t *peer_addr, uint8_t *peer_addr_type)
 
         if (is_rpa_resolvable_by_peer_rec(p_dev_rec, peer_addr)) {
             memcpy(p_dev_rec->rand_addr, peer_addr, BLE_DEV_ADDR_LEN);
+            p_dev_rec->rand_addr_type = *peer_addr_type;
             rl = ble_hs_resolv_list_find(p_dev_rec->identity_addr);
             if (rl) {
                 memcpy(peer_addr, p_dev_rec->identity_addr, BLE_DEV_ADDR_LEN);
@@ -277,13 +316,10 @@ ble_rpa_replace_peer_params_with_rl(uint8_t *peer_addr, uint8_t *addr_type,
 
     if (is_rpa) {
         ble_hs_log_flat_buf(peer_addr, BLE_DEV_ADDR_LEN);
-        rl_tmp = ble_hs_resolv_list_find(peer_addr);
+        BLE_HS_LOG(DEBUG, "\n");
 
-        /* Try to find from your peer_device records, if RL doesn't
-         * exist */
-        if (rl_tmp == NULL) {
-            rl_tmp = ble_rpa_find_rl_from_peer_records(peer_addr, addr_type);
-        }
+        /* Try to find RL from your peer_device records */
+        rl_tmp = ble_rpa_find_rl_from_peer_records(peer_addr, addr_type);
     }
 
     if (rl != NULL) {
@@ -571,7 +607,7 @@ ble_hs_resolv_list_add(uint8_t *cmdbuf)
 int
 ble_hs_resolv_list_rmv(uint8_t addr_type, uint8_t *ident_addr)
 {
-    int position;
+    int position, rc = BLE_HS_ENOENT;
 
     /* Remove from IRK records */
     position = ble_hs_is_on_resolv_list(ident_addr, addr_type);
@@ -583,10 +619,15 @@ ble_hs_resolv_list_rmv(uint8_t addr_type, uint8_t *ident_addr)
                         ble_hs_resolv_entry));
         --g_ble_hs_resolv_data.rl_cnt;
 
-        return 0;
+        rc = 0;
     }
 
-    return BLE_HS_ENOENT;
+    /* As we are removing the RL record, it is needed to change
+     * peer_address to its latest received OTA address, this helps when existing bond at
+     * peer side is removed */
+    ble_rpa_replace_id_with_rand_addr(&addr_type, ident_addr);
+
+    return rc;
 }
 
 /**

src/nimble/host/src/ble_hs_resolv_priv.h

@@ -53,6 +53,7 @@ struct ble_hs_peer_sec {
  */
 struct ble_hs_dev_records {
     bool rec_used;
+    uint8_t rand_addr_type;
     uint8_t pseudo_addr[BLE_DEV_ADDR_LEN];
     uint8_t rand_addr[BLE_DEV_ADDR_LEN];
     uint8_t identity_addr[BLE_DEV_ADDR_LEN];

src/porting/nimble/src/os_mempool.c

@@ -346,7 +346,8 @@ os_mempool_info_get_next(struct os_mempool *mp, struct os_mempool_info *omi)
     omi->omi_num_blocks = cur->mp_num_blocks;
     omi->omi_num_free = cur->mp_num_free;
     omi->omi_min_free = cur->mp_min_free;
-    strncpy(omi->omi_name, cur->name, sizeof(omi->omi_name));
+    strncpy(omi->omi_name, cur->name, sizeof(omi->omi_name) - 1);
+    omi->omi_name[sizeof(omi->omi_name) - 1] = '\0';
 
     return (cur);
 }