Skip to content

Commit c4e6c0e

Browse files
nvlsianpuadbridge
authored andcommitted
fix: - whitelistin setup modifies identitiy flag and omits address' type.
1 parent b5d9db7 commit c4e6c0e

File tree

1 file changed

+6
-2
lines changed
  • features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/source

1 file changed

+6
-2
lines changed

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/source/nRF5xGap.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,10 @@ ble_error_t nRF5xGap::getWhitelist(Gap::Whitelist_t &whitelistOut) const
733733
{
734734
uint8_t i;
735735
for (i = 0; i < whitelistAddressesSize && i < whitelistOut.capacity; ++i) {
736-
memcpy(&whitelistOut.addresses[i], &whitelistAddresses[i], sizeof(BLEProtocol::Address_t));
736+
memcpy( &whitelistOut.addresses[i].address, &whitelistAddresses[whitelistAddressesSize].addr, sizeof(whitelistOut.addresses[i].address));
737+
whitelistOut.addresses[i].type = static_cast<BLEProtocol::AddressType_t> (whitelistAddresses[whitelistAddressesSize].addr_type);
738+
739+
737740
}
738741
whitelistOut.size = i;
739742

@@ -786,7 +789,8 @@ ble_error_t nRF5xGap::setWhitelist(const Gap::Whitelist_t &whitelistIn)
786789

787790
whitelistAddressesSize = 0;
788791
for (uint8_t i = 0; i < whitelistIn.size; ++i) {
789-
memcpy(&whitelistAddresses[whitelistAddressesSize], &whitelistIn.addresses[i], sizeof(BLEProtocol::Address_t));
792+
memcpy(&whitelistAddresses[whitelistAddressesSize].addr , &whitelistIn.addresses[i].address , sizeof(whitelistAddresses[whitelistAddressesSize].addr));
793+
whitelistAddresses[whitelistAddressesSize].addr_type = static_cast<uint8_t> (whitelistIn.addresses[i].type);
790794
whitelistAddressesSize++;
791795
}
792796

0 commit comments

Comments
 (0)