Find client by handle during disconnect event.

Rather than searching the client list by connection address, search by
connection handle.
This avoids an issue where the target device has RPA enabled and
addresses will not match.

Additionally, update the client peer address with the ID address when
the identity has been resolved.

Author: gkoh

src/NimBLEClient.cpp

@@ -934,11 +934,7 @@ int NimBLEClient::handleGapEvent(struct ble_gap_event* event, void* arg) {
     switch (event->type) {
         case BLE_GAP_EVENT_DISCONNECT: {
 
-            // workaround for bug in NimBLE stack where disconnect event argument is not passed correctly
-            pClient = NimBLEDevice::getClientByPeerAddress(event->disconnect.conn.peer_ota_addr);
-            if (pClient == nullptr) {
-                pClient = NimBLEDevice::getClientByPeerAddress(event->disconnect.conn.peer_id_addr);
-            }
+            pClient = NimBLEDevice::getClientByHandle(event->disconnect.conn.conn_handle);
 
             if (pClient == nullptr) {
                 NIMBLE_LOGE(LOG_TAG, "Disconnected client not found, conn_handle=%d",
@@ -1156,6 +1152,7 @@ int NimBLEClient::handleGapEvent(struct ble_gap_event* event, void* arg) {
                 break;
             }
 
+            pClient->setPeerAddress(peerInfo.getIdAddress());
             pClient->m_pClientCallbacks->onIdentity(peerInfo);
             break;
         } // BLE_GAP_EVENT_IDENTITY_RESOLVED