From 3739bc96e437eeb77060aa4f063ace73585e17e9 Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Fri, 13 Jan 2023 11:04:22 +0100
Subject: [PATCH] bluetooth: indicated identity address in resolved address
 types

---
 CHANGELOG.md    |  1 +
 src/bluetooth.h | 10 +++++++---
 src/hci.c       |  4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b7653d12..f4c8ff7e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Changed
 - GAP: add gap_set_peer_privacy_mode with default LE_PRIVACY_MODE_DEVICE
+- bluetooth: indicated identity address in resolved address types
 
 ## Release v1.5.5
 
diff --git a/src/bluetooth.h b/src/bluetooth.h
index 014ed9edc..d6090a0f2 100644
--- a/src/bluetooth.h
+++ b/src/bluetooth.h
@@ -63,13 +63,17 @@ typedef uint8_t bd_addr_t[BD_ADDR_LEN];
 
 /**
  * Address types
- * @note: BTstack uses a custom addr type to refer to classic ACL and SCO devices
  */
  typedef enum {
+    // Public Device Address
     BD_ADDR_TYPE_LE_PUBLIC = 0,
+    // Random Device Address
     BD_ADDR_TYPE_LE_RANDOM = 1,
-    BD_ADDR_TYPE_LE_PRIVAT_FALLBACK_PUBLIC = 2,
-    BD_ADDR_TYPE_LE_PRIVAT_FALLBACK_RANDOM = 3,
+    // Public Identity Address (Corresponds to Resolved Private Address)
+    BD_ADDR_TYPE_LE_PUBLIC_IDENTITY = 2,
+    // Random (static) Identity Address (Corresponds to Resolved Private Address)
+    BD_ADDR_TYPE_LE_RANDOM_IDENTITY = 3,
+    // internal BTstack addr types for Classic connections
     BD_ADDR_TYPE_SCO       = 0xfc,
     BD_ADDR_TYPE_ACL       = 0xfd,
     BD_ADDR_TYPE_UNKNOWN   = 0xfe,  // also used as 'invalid'
diff --git a/src/hci.c b/src/hci.c
index b01d45f59..f0ced5ed2 100644
--- a/src/hci.c
+++ b/src/hci.c
@@ -607,8 +607,8 @@ static bool hci_is_le_connection_type(bd_addr_type_t address_type){
     switch (address_type){
         case BD_ADDR_TYPE_LE_PUBLIC:
         case BD_ADDR_TYPE_LE_RANDOM:
-        case BD_ADDR_TYPE_LE_PRIVAT_FALLBACK_PUBLIC:
-        case BD_ADDR_TYPE_LE_PRIVAT_FALLBACK_RANDOM:
+        case BD_ADDR_TYPE_LE_PUBLIC_IDENTITY:
+        case BD_ADDR_TYPE_LE_RANDOM_IDENTITY:
             return true;
         default:
             return false;