ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BLE: Add more precondition check to GenericGap.

pull/8738/head
Vincent Coubard 2018-11-11 18:02:37 +00:00
parent d23bd2f268
commit 3eebcc49ad
3 changed files with 63 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/FEATURE_BLE/ble/Gap.h
View File

@ -1753,7 +1753,7 @@ public:
return BLE_ERROR_NOT_IMPLEMENTED;
}
virtual bool isAdvertisingActive(AdvHandle_t handle) const {
virtual bool isAdvertisingActive(AdvHandle_t handle) {
return false;
}

2
features/FEATURE_BLE/ble/generic/GenericGap.h
View File

@ -112,7 +112,7 @@ public:
ble_error_t stopAdvertising(AdvHandle_t handle);
bool isAdvertisingActive(AdvHandle_t handle) const;
bool isAdvertisingActive(AdvHandle_t handle);
virtual ble_error_t setPeriodicAdvertisingParameters(
AdvHandle_t handle,

65
features/FEATURE_BLE/source/generic/GenericGap.cpp
View File

@ -1650,6 +1650,10 @@ ble_error_t GenericGap::setAdvertisingParams(
AdvHandle_t handle,
const GapAdvertisingParameters &params
) {
if (handle >= getMaxAdvertisingSetNumber()) {
return BLE_ERROR_INVALID_PARAM;
}
if (!_existing_sets.get(handle)) {
return BLE_ERROR_INVALID_PARAM;
}
@ -1687,6 +1691,10 @@ ble_error_t GenericGap::setExtendedAdvertisingParameters(
const GapAdvertisingParameters &params
)
{
if (handle >= getMaxAdvertisingSetNumber()) {
return BLE_ERROR_INVALID_PARAM;
}
pal::advertising_event_properties_t event_properties(
(pal::advertising_type_t::type)params.getType());
event_properties.include_tx_power = params.getTxPowerInHeader();
@ -1754,6 +1762,10 @@ ble_error_t GenericGap::setAdvertisingData(
const uint8_t *scan_response_data
);
if (handle >= getMaxAdvertisingSetNumber()) {
return BLE_ERROR_INVALID_PARAM;
}
if (!_existing_sets.get(handle)) {
return BLE_ERROR_INVALID_PARAM;
}
@ -1764,7 +1776,7 @@ ble_error_t GenericGap::setAdvertisingData(
return BLE_ERROR_INVALID_PARAM;
}
if (payload.size() < GAP_ADVERTISING_DATA_MAX_PAYLOAD) {
if (payload.size() > GAP_ADVERTISING_DATA_MAX_PAYLOAD) {
return BLE_ERROR_INVALID_PARAM;
}
@ -1780,6 +1792,10 @@ ble_error_t GenericGap::setAdvertisingData(
);
}
if (payload.size() > getMaxAdvertisingDataLength()) {
return BLE_ERROR_INVALID_PARAM;
}
// select the pal function
set_data_fn_t set_data = scan_response ?
&pal::Gap::set_extended_scan_response_data :
@ -1824,6 +1840,10 @@ ble_error_t GenericGap::startAdvertising(
uint8_t maxEvents
)
{
if (handle >= getMaxAdvertisingSetNumber()) {
return BLE_ERROR_INVALID_PARAM;
}
if (!_existing_sets.get(handle)) {
return BLE_ERROR_INVALID_PARAM;
}
@ -1867,6 +1887,10 @@ ble_error_t GenericGap::startAdvertising(
}
ble_error_t GenericGap::stopAdvertising(AdvHandle_t handle) {
if (handle >= getMaxAdvertisingSetNumber()) {
return BLE_ERROR_INVALID_PARAM;
}
if (_existing_sets.get(handle)) {
return BLE_ERROR_INVALID_PARAM;
}
@ -1893,7 +1917,11 @@ ble_error_t GenericGap::stopAdvertising(AdvHandle_t handle) {
);
}
bool GenericGap::isAdvertisingActive(AdvHandle_t handle) const {
bool GenericGap::isAdvertisingActive(AdvHandle_t handle) {
if (handle >= getMaxAdvertisingSetNumber()) {
return BLE_ERROR_INVALID_PARAM;
}
return _active_sets.get(handle);
}
@ -1907,11 +1935,11 @@ ble_error_t GenericGap::setPeriodicAdvertisingParameters(
uint16_t interval_min = (periodicAdvertisingIntervalMinMs * 100) / 125;
uint16_t interval_max = (periodicAdvertisingIntervalMinMs * 100) / 125;
if (interval_min < 6) {
if (interval_min < 6 || interval_min > 0xFFFF) {
return BLE_ERROR_INVALID_PARAM;
}
if (interval_max < 6) {
if (interval_max < 6 || interval_max > 0xFFFF) {
return BLE_ERROR_INVALID_PARAM;
}
@ -1923,6 +1951,10 @@ ble_error_t GenericGap::setPeriodicAdvertisingParameters(
return BLE_ERROR_INVALID_PARAM;
}
if (handle >= getMaxAdvertisingSetNumber()) {
return BLE_ERROR_INVALID_PARAM;
}
if (!_existing_sets.get(handle)) {
return BLE_ERROR_INVALID_STATE;
}
@ -1944,10 +1976,18 @@ ble_error_t GenericGap::setPeriodicAdvertisingPayload(
return BLE_ERROR_INVALID_PARAM;
}
if (handle >= getMaxAdvertisingSetNumber()) {
return BLE_ERROR_INVALID_PARAM;
}
if (!_existing_sets.get(handle)) {
return BLE_ERROR_INVALID_STATE;
}
if (payload.size() > getMaxAdvertisingDataLength()) {
return BLE_ERROR_INVALID_PARAM;
}
typedef pal::advertising_fragment_description_t op_t;
for (size_t i = 0, end = payload.size(); i < end; i += MAX_HCI_DATA_LENGTH) {
@ -1988,10 +2028,19 @@ ble_error_t GenericGap::startPeriodicAdvertising(Gap::AdvHandle_t handle)
return BLE_ERROR_INVALID_PARAM;
}
if (handle >= getMaxAdvertisingSetNumber()) {
return BLE_ERROR_INVALID_PARAM;
}
if (!_existing_sets.get(handle)) {
return BLE_ERROR_INVALID_STATE;
}
if (_active_sets.get(handle) == false) {
// FIXME: should we start periodic advertising behind the user's back ?
return BLE_ERROR_INVALID_STATE;
}
if (_active_periodic_sets.get(handle) == true) {
return BLE_ERROR_INVALID_STATE;
}
@ -2011,6 +2060,10 @@ ble_error_t GenericGap::stopPeriodicAdvertising(Gap::AdvHandle_t handle)
return BLE_ERROR_INVALID_PARAM;
}
if (handle >= getMaxAdvertisingSetNumber()) {
return BLE_ERROR_INVALID_PARAM;
}
if (!_existing_sets.get(handle)) {
return BLE_ERROR_INVALID_STATE;
}
@ -2031,6 +2084,10 @@ ble_error_t GenericGap::stopPeriodicAdvertising(Gap::AdvHandle_t handle)
bool GenericGap::isPeriodicAdvertisingActive(Gap::AdvHandle_t handle)
{
if (handle >= getMaxAdvertisingSetNumber()) {
return BLE_ERROR_INVALID_PARAM;
}
return _active_periodic_sets.get(handle);
}