mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-23 09:41:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

hci: replace bd_addr placeholder in adv data and scan response data with actual bd addr string

Browse Source
This commit is contained in:
Matthias Ringwald 2017-08-17 11:21:25 +02:00
parent ad0d11084a
commit f868b05943
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gap.h
View File

@ -126,7 +126,7 @@ gap_connection_type_t gap_get_connection_type(hci_con_handle_t connection_handle
* @brief Sets local name.
* @note has to be done before stack starts up
* @note Default name is 'BTstack 00:00:00:00:00:00'
* @note '00:00:00:00:00:00' in local_name will be replaced with actual name
* @note '00:00:00:00:00:00' in local_name will be replaced with actual bd addr
* @param name is not copied, make sure memory is accessible during stack startup
*/
void gap_set_local_name(const char * local_name);
@ -135,7 +135,7 @@ void gap_set_local_name(const char * local_name);
* @brief Set Extended Inquiry Response data
* @note has to be done before stack starts up
* @note If not set, local name will be used for EIR data (see gap_set_local_name)
* @note '00:00:00:00:00:00' in local_name will be replaced with actual name
* @note '00:00:00:00:00:00' in local_name will be replaced with actual bd addr
* @param eir_data size 240 bytes, is not copied make sure memory is accessible during stack startup
*/
void gap_set_extended_inquiry_response(const uint8_t * data);
@ -242,6 +242,7 @@ void gap_random_address_set(bd_addr_t addr);
* @param advertising_data_length
* @param advertising_data (max 31 octets)
* @note data is not copied, pointer has to stay valid
* @note '00:00:00:00:00:00' in advertising_data will be replaced with actual bd addr
*/
void gap_advertisements_set_data(uint8_t advertising_data_length, uint8_t * advertising_data);
@ -273,6 +274,7 @@ void gap_advertisements_enable(int enabled);
* @param advertising_data_length
* @param advertising_data (max 31 octets)
* @note data is not copied, pointer has to stay valid
* @note '00:00:00:00:00:00' in scan_response_data will be replaced with actual bd addr
*/
void gap_scan_response_set_data(uint8_t scan_response_data_length, uint8_t * scan_response_data);

8
src/hci.c
View File

@ -2993,13 +2993,17 @@ static void hci_run(void){
uint8_t adv_data_clean[31];
memset(adv_data_clean, 0, sizeof(adv_data_clean));
memcpy(adv_data_clean, hci_stack->le_advertisements_data, hci_stack->le_advertisements_data_len);
hci_replace_bd_addr_placeholder(adv_data_clean, hci_stack->le_advertisements_data_len);
hci_send_cmd(&hci_le_set_advertising_data, hci_stack->le_advertisements_data_len, adv_data_clean);
return;
}
if (hci_stack->le_advertisements_todo & LE_ADVERTISEMENT_TASKS_SET_SCAN_DATA){
hci_stack->le_advertisements_todo &= ~LE_ADVERTISEMENT_TASKS_SET_SCAN_DATA;
hci_send_cmd(&hci_le_set_scan_response_data, hci_stack->le_scan_response_data_len,
hci_stack->le_scan_response_data);
uint8_t scan_data_clean[31];
memset(scan_data_clean, 0, sizeof(scan_data_clean));
memcpy(scan_data_clean, hci_stack->hci_le_set_scan_response_data, hci_stack->le_scan_response_data_len);
hci_replace_bd_addr_placeholder(scan_data_clean, hci_stack->le_scan_response_data_len);
hci_send_cmd(&hci_le_set_scan_response_data, hci_stack->le_scan_response_data_len, hci_stack->le_scan_response_data);
return;
}
if (hci_stack->le_advertisements_todo & LE_ADVERTISEMENT_TASKS_ENABLE){