commit 6a79e74157d17099ab567398c144a79b07444f99
author Chris Manton <cmanton@google.com> Tue Oct 26 22:36:02 2021 -0700
committer Chris Manton <cmanton@google.com> Fri Oct 29 20:43:35 2021 +0000
tree 33c1e08e184c6881ec431af96a8f7cb1c397909c
parent 39dd19d8a33224bcc07be2f70eba20304a3c0358

legacy: Co-locate le address and le address types

Bug: 203417776
Tag: #refactor
Test: gd/cert/run

Change-Id: I1c1fb44f2dd0189824375352fd5300bd4912526a

main/shim/acl.cc

diff --git a/main/shim/acl.cc b/main/shim/acl.cc
index 5f1aa9f..f3080da 100644
--- a/main/shim/acl.cc
+++ b/main/shim/acl.cc
@@ -1047,10 +1047,12 @@
                   common::ToString(link.peer_le_features_valid).c_str(),
                   bd_features_text(link.peer_le_features).c_str());
 
-      LOG_DUMPSYS(fd, "    [le] active_remote_addr:%s",
-                  link.active_remote_addr.ToString().c_str());
-      LOG_DUMPSYS(fd, "    [le] conn_addr:%s",
-                  link.conn_addr.ToString().c_str());
+      LOG_DUMPSYS(fd, "    [le] active_remote_addr:%s[%s]",
+                  link.active_remote_addr.ToString().c_str(),
+                  AddressTypeText(link.active_remote_addr_type).c_str());
+      LOG_DUMPSYS(fd, "    [le] conn_addr:%s[%s]",
+                  link.conn_addr.ToString().c_str(),
+                  AddressTypeText(link.conn_addr_type).c_str());
     }
   }
 }

stack/acl/acl.h

diff --git a/stack/acl/acl.h b/stack/acl/acl.h
index 9c4c9e6..d114cda 100644
--- a/stack/acl/acl.h
+++ b/stack/acl/acl.h
@@ -176,7 +176,10 @@
   bool peer_lmp_feature_valid[HCI_EXT_FEATURES_PAGE_MAX + 1];
 
   RawAddress active_remote_addr;
+  tBLE_ADDR_TYPE active_remote_addr_type;
   RawAddress conn_addr;
+  tBLE_ADDR_TYPE conn_addr_type;
+
   RawAddress remote_addr;
   bool in_use{false};
 
@@ -200,8 +203,6 @@
   uint16_t Handle() const { return hci_handle; }
   uint16_t link_super_tout;
   uint16_t pkt_types_mask;
-  tBLE_ADDR_TYPE active_remote_addr_type;
-  tBLE_ADDR_TYPE conn_addr_type;
   uint8_t disconnect_reason;
 
  private: