Add support to resolve MAC address

Return the resolved MAC address instead of the random public one

Author: cassio-lazaro

services/ble/Gap.cpp

@@ -84,6 +84,11 @@ namespace services
         return GapBondingObserver::Subject().GetNumberOfBonds();
     }
 
+    bool GapBondingDecorator::IsDeviceBounded(hal::MacAddress deviceAddress) const
+    {
+        return GapBondingObserver::Subject().IsDeviceBounded(deviceAddress);
+    }
+
     void GapPeripheralDecorator::StateChanged(GapState state)
     {
         GapPeripheral::NotifyObservers([&state](auto& obs)
@@ -178,6 +183,11 @@ namespace services
         GapCentralObserver::Subject().StopDeviceDiscovery();
     }
 
+    hal::MacAddress GapCentralDecorator::ResolveDeviceAddress(hal::MacAddress deviceAddress) const
+    {
+        return GapCentralObserver::Subject().ResolveDeviceAddress(deviceAddress);
+    }
+
     GapAdvertisingDataParser::GapAdvertisingDataParser(infra::ConstByteRange data)
         : data(data)
     {}

services/ble/Gap.hpp

@@ -207,6 +207,7 @@ namespace services
 
         virtual std::size_t GetMaxNumberOfBonds() const = 0;
         virtual std::size_t GetNumberOfBonds() const = 0;
+        virtual bool IsDeviceBounded(hal::MacAddress deviceAddress) const = 0;
     };
 
     class GapBondingDecorator
@@ -224,6 +225,7 @@ namespace services
         void RemoveOldestBond() override;
         std::size_t GetMaxNumberOfBonds() const override;
         std::size_t GetNumberOfBonds() const override;
+        bool IsDeviceBounded(hal::MacAddress deviceAddress) const override;
     };
 
     class GapPeripheral;
@@ -317,6 +319,7 @@ namespace services
         virtual void SetAddress(hal::MacAddress macAddress, GapDeviceAddressType addressType) = 0;
         virtual void StartDeviceDiscovery() = 0;
         virtual void StopDeviceDiscovery() = 0;
+        virtual hal::MacAddress ResolveDeviceAddress(hal::MacAddress deviceAddress) const = 0;
     };
 
     class GapCentralDecorator
@@ -337,6 +340,7 @@ namespace services
         void SetAddress(hal::MacAddress macAddress, GapDeviceAddressType addressType) override;
         void StartDeviceDiscovery() override;
         void StopDeviceDiscovery() override;
+        hal::MacAddress ResolveDeviceAddress(hal::MacAddress deviceAddress) const override;
     };
 }
 

services/ble/Gap.proto

@@ -194,6 +194,8 @@ service GapCentral
     rpc NumericComparisonConfirm(BoolValue) returns (Nothing) { option (method_id) = 10; }
     rpc RemoveAllBonds(Nothing) returns (Nothing) { option (method_id) = 11; }
     rpc SetDeviceDiscoveryFilter(DeviceDiscoveryFilter) returns (Nothing) { option (method_id) = 12; }
+    rpc ResolveDeviceAddress(Address) returns (Nothing) { option (method_id) = 13; }
+    rpc IsDeviceBounded(Address) returns (Nothing) { option (method_id) = 14; }
 }
 
 service GapPeripheralResponse
@@ -218,4 +220,6 @@ service GapCentralResponse
     rpc PairingFailed(PairingStatus) returns (Nothing) { option (method_id) = 5; }
     rpc NumberOfBondsChanged(UInt32Value) returns (Nothing) { option (method_id) = 6; }
     rpc DeviceStarted(Nothing) returns (Nothing) { option (method_id) = 7; }
+    rpc ResolveDeviceAddress(Address) returns (Nothing) { option (method_id) = 8; }
+    rpc IsDeviceBounded(Address) returns (Nothing) { option (method_id) = 9; }
 }

services/ble/test/TestGapBonding.cpp

@@ -41,5 +41,12 @@ namespace services
 
         EXPECT_CALL(gapBonding, GetNumberOfBonds()).WillOnce(testing::Return(5));
         EXPECT_EQ(decorator.GetNumberOfBonds(), 5);
+
+        hal::MacAddress mac = { 0x00, 0x1A, 0x7D, 0xDA, 0x71, 0x13 };
+        EXPECT_CALL(gapBonding, IsDeviceBounded(mac)).WillOnce(testing::Return(true));
+        EXPECT_THAT(decorator.IsDeviceBounded(mac), testing::IsTrue());
+
+        EXPECT_CALL(gapBonding, IsDeviceBounded(mac)).WillOnce(testing::Return(false));
+        EXPECT_THAT(decorator.IsDeviceBounded(mac), testing::IsFalse());
     }
 }

services/ble/test/TestGapCentral.cpp

@@ -79,6 +79,10 @@ namespace services
 
         EXPECT_CALL(gap, StopDeviceDiscovery());
         decorator.StopDeviceDiscovery();
+
+        hal::MacAddress mac = { 0x00, 0x1A, 0x7D, 0xDA, 0x71, 0x13 };
+        EXPECT_CALL(gap, ResolveDeviceAddress(mac));
+        decorator.ResolveDeviceAddress(mac);
     }
 
     TEST(GapAdvertisingDataParserTest, payload_too_small)

services/ble/test_doubles/GapBondingMock.hpp

@@ -14,6 +14,7 @@ namespace services
         MOCK_METHOD(void, RemoveOldestBond, ());
         MOCK_METHOD(std::size_t, GetMaxNumberOfBonds, (), (const));
         MOCK_METHOD(std::size_t, GetNumberOfBonds, (), (const));
+        MOCK_METHOD(bool, IsDeviceBounded, (hal::MacAddress deviceAddress), (const));
     };
 }
 

services/ble/test_doubles/GapCentralMock.hpp

@@ -16,6 +16,7 @@ namespace services
         MOCK_METHOD(void, SetAddress, (hal::MacAddress macAddress, GapDeviceAddressType addressType));
         MOCK_METHOD(void, StartDeviceDiscovery, ());
         MOCK_METHOD(void, StopDeviceDiscovery, ());
+        MOCK_METHOD(hal::MacAddress, ResolveDeviceAddress, (hal::MacAddress deviceAddress), (const));
     };
 }