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

use _initiating to block scan manipulation

pull/13759/head
Paul Szczeanek 2020-10-01 11:16:44 +01:00 committed by Vincent Coubard
parent f0bbc4c7ae
commit 6ee5740941
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
View File

@ -468,11 +468,7 @@ ble_error_t Gap::stopScan()
{ {
ble_error_t err; ble_error_t err;
if ((!_scan_enabled && !_scan_pending) || _scan_pending if ((!_scan_enabled && !_scan_pending) || _scan_pending || _initiating) {
#if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
|| (_connect_to_host_resolved_address_state != ConnectionToHostResolvedAddressState::idle)
#endif // BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
) {
return BLE_STACK_BUSY; return BLE_STACK_BUSY;
} }
@ -535,15 +531,26 @@ ble_error_t Gap::connect(
ble_error_t ret = BLE_ERROR_INTERNAL_STACK_FAILURE; ble_error_t ret = BLE_ERROR_INTERNAL_STACK_FAILURE;
#if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION #if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
/* if host resolution is used we need to connect in two passes, first we scan for addresses to find
* a resolving match and then we call connect again with the correct address */
if (_connect_to_host_resolved_address_state == ConnectionToHostResolvedAddressState::idle) { if (_connect_to_host_resolved_address_state == ConnectionToHostResolvedAddressState::idle) {
if (peerAddressType == peer_address_type_t::RANDOM_STATIC_IDENTITY || if (peerAddressType == peer_address_type_t::RANDOM_STATIC_IDENTITY ||
peerAddressType == peer_address_type_t::PUBLIC_IDENTITY) { peerAddressType == peer_address_type_t::PUBLIC_IDENTITY) {
_connect_to_host_resolved_address_parameters = new ConnectionParameters(connectionParams);
if (!_connect_to_host_resolved_address_parameters) {
return BLE_ERROR_NO_MEM;
}
_connect_to_host_resolved_address_type = peerAddressType; _connect_to_host_resolved_address_type = peerAddressType;
_connect_to_host_resolved_address = peerAddress; _connect_to_host_resolved_address = peerAddress;
_connect_to_host_resolved_address_state = ConnectionToHostResolvedAddressState::scan; _connect_to_host_resolved_address_state = ConnectionToHostResolvedAddressState::scan;
} }
} else if (_connect_to_host_resolved_address_state == ConnectionToHostResolvedAddressState::connect) { } else if (_connect_to_host_resolved_address_state == ConnectionToHostResolvedAddressState::connect) {
/* the first pass of connect has completed and this is the second connect that doesn't require
* address resolution */
_connect_to_host_resolved_address_state = ConnectionToHostResolvedAddressState::idle; _connect_to_host_resolved_address_state = ConnectionToHostResolvedAddressState::idle;
_initiating = false;
} }
#endif // BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION #endif // BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
@ -570,13 +577,7 @@ ble_error_t Gap::connect(
duplicates_filter_t::ENABLE, duplicates_filter_t::ENABLE,
(scan_period_t)0 (scan_period_t)0
); );
if (ret == BLE_ERROR_NONE) { if (ret != BLE_ERROR_NONE) {
_connect_to_host_resolved_address_parameters = new ConnectionParameters(connectionParams);
if (!_connect_to_host_resolved_address_parameters) {
_connect_to_host_resolved_address_state = ConnectionToHostResolvedAddressState::idle;
ret = BLE_ERROR_NO_MEM;
}
} else {
_connect_to_host_resolved_address_state = ConnectionToHostResolvedAddressState::idle; _connect_to_host_resolved_address_state = ConnectionToHostResolvedAddressState::idle;
} }
} else } else
@ -1077,7 +1078,7 @@ ble_error_t Gap::reset()
shutdownCallChain.clear(); shutdownCallChain.clear();
_event_handler = nullptr; _event_handler = nullptr;
_initiating = false;
#if BLE_FEATURE_PRIVACY #if BLE_FEATURE_PRIVACY
_privacy_initialization_pending = false; _privacy_initialization_pending = false;
#if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION #if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
@ -1228,6 +1229,7 @@ void Gap::connecting_to_host_resolved_address_failed(bool inform_user)
_connect_to_host_resolved_address_state = ConnectionToHostResolvedAddressState::idle; _connect_to_host_resolved_address_state = ConnectionToHostResolvedAddressState::idle;
delete _connect_to_host_resolved_address_parameters; delete _connect_to_host_resolved_address_parameters;
_connect_to_host_resolved_address_parameters = nullptr; _connect_to_host_resolved_address_parameters = nullptr;
_initiating = false;
} }
#endif // BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION #endif // BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
@ -2999,11 +3001,7 @@ ble_error_t Gap::startScan(
scan_period_t period scan_period_t period
) )
{ {
if (_scan_pending || _scan_address_refresh if (_scan_pending || _scan_address_refresh || _initiating) {
#if BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
|| (_connect_to_host_resolved_address_state != ConnectionToHostResolvedAddressState::idle)
#endif // BLE_GAP_HOST_BASED_PRIVATE_ADDRESS_RESOLUTION
) {
return BLE_STACK_BUSY; return BLE_STACK_BUSY;
} }