feat: add possibility to choose the ownAddressType in the Arduino stack

Signed-off-by: Carlo Parata <[email protected]>

Author: cparata

src/local/BLELocalDevice.cpp

@@ -39,7 +39,7 @@
 #endif
 #endif
 
-BLELocalDevice::BLELocalDevice()
+BLELocalDevice::BLELocalDevice(uint8_t ownBdaddrType): _ownBdaddrType(ownBdaddrType)
 {
   _advertisingData.setFlags(BLEFlagsGeneralDiscoverable | BLEFlagsBREDRNotSupported);
 }
@@ -207,6 +207,10 @@ int BLELocalDevice::begin()
 
   GATT.begin();
 
+  GAP.setOwnBdaddrType(_ownBdaddrType);
+
+  ATT.setOwnBdaddrType(_ownBdaddrType);
+
   return 1;
 }
 

src/local/BLELocalDevice.h

@@ -30,9 +30,16 @@ enum Pairable {
   ONCE = 2,
 };
 
+enum AddressType {
+  PUBLIC_ADDR = 0,
+  STATIC_RANDOM_ADDR = 1,
+  RESOLVABLE_PRIVATE_ADDR = 2,
+  NON_RESOLVABLE_PRIVATE_ADDR = 3,
+};
+
 class BLELocalDevice {
 public:
-  BLELocalDevice();
+  BLELocalDevice(uint8_t ownBdaddrType = STATIC_RANDOM_ADDR);
   virtual ~BLELocalDevice();
 
   virtual int begin();
@@ -107,6 +114,7 @@ class BLELocalDevice {
 
   virtual void setDisplayCode(void (*displayCode)(uint32_t confirmationCode));
   virtual void setBinaryConfirmPairing(bool (*binaryConfirmPairing)());
+
   uint8_t BDaddress[6];
 
 protected:
@@ -116,6 +124,7 @@ class BLELocalDevice {
 private:
   BLEAdvertisingData _advertisingData;
   BLEAdvertisingData _scanResponseData;
+  uint8_t _ownBdaddrType;
 };
 
 extern BLELocalDevice& BLE;

src/utility/ATT.cpp

@@ -114,7 +114,7 @@ ATTClass::~ATTClass()
 
 bool ATTClass::connect(uint8_t peerBdaddrType, uint8_t peerBdaddr[6])
 {
-  if (HCI.leCreateConn(0x0060, 0x0030, 0x00, peerBdaddrType, peerBdaddr, 0x00,
+  if (HCI.leCreateConn(0x0060, 0x0030, 0x00, peerBdaddrType, peerBdaddr, _ownBdaddrType,
                         0x0006, 0x000c, 0x0000, 0x00c8, 0x0004, 0x0006) != 0) {
     return false;
   }
@@ -1957,6 +1957,16 @@ int ATTClass::getPeerResolvedAddress(uint16_t connectionHandle, uint8_t resolved
   return 0;
 }
 
+void ATTClass::setOwnBdaddrType(uint8_t ownBdaddrType)
+{
+  _ownBdaddrType = ownBdaddrType;
+}
+
+uint8_t ATTClass::getOwnBdaddrType(void)
+{
+  return _ownBdaddrType;
+}
+
 #if !defined(FAKE_ATT)
 ATTClass ATTObj;
 ATTClass& ATT = ATTObj;

src/utility/ATT.h

@@ -109,6 +109,10 @@ class ATTClass {
   uint8_t peerIRK[16];
   /// This is just a random number... Not sure it has use unless privacy mode is active.
   uint8_t localIRK[16] = {0x54,0x83,0x63,0x7c,0xc5,0x1e,0xf7,0xec,0x32,0xdd,0xad,0x51,0x89,0x4b,0x9e,0x07};
+
+  void setOwnBdaddrType(uint8_t ownBdaddrType);
+  uint8_t getOwnBdaddrType(); // Used in L2CAPSignaling to encryption
+
 private:
   virtual void error(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
   virtual void mtuReq(uint16_t connectionHandle, uint8_t dlen, uint8_t data[]);
@@ -170,6 +174,8 @@ class ATTClass {
   } _pendingResp;
 
   BLEDeviceEventHandler _eventHandlers[2];
+
+  uint8_t _ownBdaddrType;
 };
 
 extern ATTClass& ATT;

src/utility/GAP.cpp

@@ -54,7 +54,7 @@ int GAPClass::advertise(uint8_t* advData, uint8_t advDataLen, uint8_t* scanData,
 
   stopAdvertise();
 
-  if (HCI.leSetAdvertisingParameters(_advertisingInterval, _advertisingInterval, type, 0x00, 0x00, directBdaddr, 0x07, 0) != 0) {
+  if (HCI.leSetAdvertisingParameters(_advertisingInterval, _advertisingInterval, type, _ownBdaddrType, 0x00, directBdaddr, 0x07, 0) != 0) {
     return 0;
   }
 
@@ -93,7 +93,7 @@ int GAPClass::scan(bool withDuplicates)
     - scan window: mandatory range from 0x0011 to 0x1000
     - The scan window can only be less than or equal to the scan interval
   */
-  if (HCI.leSetScanParameters(0x01, 0x0020, 0x0020, 0x00, 0x00) != 0) {
+  if (HCI.leSetScanParameters(0x01, 0x0020, 0x0020, _ownBdaddrType, 0x00) != 0) {
     return false;
   }
 
@@ -266,6 +266,11 @@ bool GAPClass::matchesScanFilter(const BLEDevice& device)
   return true;
 }
 
+void GAPClass::setOwnBdaddrType(uint8_t ownBdaddrType)
+{
+  _ownBdaddrType = ownBdaddrType;
+}
+
 #if !defined(FAKE_GAP)
 GAPClass GAPObj;
 GAPClass& GAP = GAPObj;

src/utility/GAP.h

@@ -45,6 +45,8 @@ class GAPClass {
 
   virtual void setEventHandler(BLEDeviceEvent event, BLEDeviceEventHandler eventHandler);
 
+  void setOwnBdaddrType(uint8_t ownBdaddrType);
+
 protected:
   friend class HCIClass;
 
@@ -67,6 +69,7 @@ class GAPClass {
   String _scanNameFilter;
   String _scanUuidFilter;
   String _scanAddressFilter;
+  uint8_t _ownBdaddrType;
 };
 
 extern GAPClass& GAP;