Schoumi/microbit-dal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

WIP: compiling but untested first cut at whitelisting code

Browse source
This commit is contained in:
Joe Finney 2016-01-13 00:20:37 +00:00
parent c568dd7cf0
commit 90cf35a38a
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/ble-services/MicroBitBLEManager.cpp
View file

@ -139,7 +139,17 @@ void MicroBitBLEManager::init(ManagedString deviceName, ManagedString serialNumb
ble->securityManager().onSecuritySetupCompleted(securitySetupCompletedCallback);
ble->securityManager().init(MICROBIT_BLE_ENABLE_BONDING, MICROBIT_BLE_REQUIRE_MITM, SecurityManager::IO_CAPS_DISPLAY_ONLY);
// Bring up any configured auxiliary services.
// Configure a whitelist to filter all traffic from unbonded devices. Most BLE stacks only permit one connection at a time,
// so this prevents denial of service attacks.
BLEProtocol::Address_t bondedAddresses[4];
Gap::Whitelist_t whitelist;
whitelist.addresses = bondedAddresses;
whitelist.capacity = 4;
ble->securityManager().getAddressesFromBondTable(whitelist);
ble->gap().setWhitelist(whitelist);
// Bring up any configured auxiliary services.
#if CONFIG_ENABLED(MICROBIT_BLE_DFU_SERVICE)
new MicroBitDFUService(*ble);
#endif
@ -189,7 +199,9 @@ void MicroBitBLEManager::init(ManagedString deviceName, ManagedString serialNumb
ble->accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LOCAL_NAME, (uint8_t *)BLEName.toCharArray(), BLEName.length());
ble->setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
ble->setAdvertisingInterval(200);
ble->startAdvertising();
if (whitelist.size > 0)
ble->startAdvertising();
}
/**
@ -230,6 +242,14 @@ void MicroBitBLEManager::pairingMode(MicroBitDisplay &display)
int brightness = 255;
int fadeDirection = 0;
// Clear the whitelist, so we're discoverable by all BLE devices.
BLEProtocol::Address_t addresses[4];
Gap::Whitelist_t whitelist;
whitelist.addresses = addresses;
whitelist.capacity = 4;
whitelist.size = 0;
ble->gap().setWhitelist(whitelist);
// Update the advertised name of this micro:bit to include the device name
ble->clearAdvertisingPayload();