Merge "stack::rnr Consolidate RNR from inquiry module" into main am: ee4b0d4da0 (1e4979dc) · Commits · e / os / android_packages_modules_Bluetooth

system/main/shim/acl_api.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,8 +35,8 @@
		#include "stack/btm/btm_sec.h"
		#include "stack/btm/security_device_record.h"
		#include "stack/include/bt_hdr.h"
		#include "stack/include/inq_hci_link_interface.h"
		#include "stack/include/main_thread.h"
		#include "stack/rnr/remote_name_request.h"
		#include "types/ble_address_with_type.h"
		#include "types/raw_address.h"
		#ifndef PROPERTY_BLE_PRIVACY_OWN_ADDRESS_ENABLED

system/stack/btm/btm_inq.cc

+1 −274

Original line number	Diff line number	Diff line
		@@ -36,13 +36,11 @@
		#include <mutex>

		#include "btif/include/btif_acl.h"
		#include "btif/include/btif_config.h"
		#include "common/time_util.h"
		#include "hci/controller_interface.h"
		#include "hci/event_checkers.h"
		#include "hci/hci_interface.h"
		#include "internal_include/bt_target.h"
		#include "main/shim/acl_api.h"
		#include "main/shim/entry.h"
		#include "main/shim/helpers.h"
		#include "main/shim/shim.h"
		@@ -52,16 +50,14 @@
		#include "packet/bit_inserter.h"
		#include "stack/btm/btm_eir.h"
		#include "stack/btm/btm_int_types.h"
		#include "stack/btm/btm_sec.h"
		#include "stack/btm/neighbor_inquiry.h"
		#include "stack/btm/security_device_record.h"
		#include "stack/include/acl_api_types.h"
		#include "stack/include/advertise_data_parser.h"
		#include "stack/include/bt_hdr.h"
		#include "stack/include/bt_lap.h"
		#include "stack/include/bt_name.h"
		#include "stack/include/bt_types.h"
		#include "stack/include/bt_uuid16.h"
		#include "stack/include/btm_ble_api.h"
		#include "stack/include/btm_client_interface.h"
		#include "stack/include/btm_log_history.h"
		#include "stack/include/hci_error_code.h"
		@@ -119,9 +115,6 @@ uint16_t max_bd_entries_; /* Maximum number of entries that can be stored */

		extern tBTM_CB btm_cb;
		void btm_inq_db_set_inq_by_rssi(void);
		void btm_inq_remote_name_timer_timeout(void* data);
		tBTM_STATUS btm_ble_read_remote_name(const RawAddress& remote_bda, tBTM_NAME_CMPL_CB* p_cb);
		bool btm_ble_cancel_remote_name(const RawAddress& remote_bda);
		tBTM_STATUS btm_ble_set_discoverability(uint16_t combined_mode);
		tBTM_STATUS btm_ble_set_connectability(uint16_t combined_mode);

		@@ -245,9 +238,6 @@ const uint16_t BTM_EIR_UUID_LKUP_TBL[BTM_EIR_MAX_SERVICES] = {
		static void btm_clr_inq_db(const RawAddress* p_bda);
		static void btm_init_inq_result_flt(void);
		void btm_clr_inq_result_flt(void);
		static void btm_inq_rmt_name_failed_cancelled(void);
		static tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda, uint64_t timeout_ms,
		tBTM_NAME_CMPL_CB* p_cb);

		static uint8_t btm_convert_uuid_to_eir_service(uint16_t uuid16);
		void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);
		@@ -783,88 +773,6 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, tBTM_CMPL_CB* p_
		return BTM_CMD_STARTED;
		}

		/*******************************************************************************
		*
		* Function BTM_ReadRemoteDeviceName
		*
		* Description This function initiates a remote device HCI command to the
		* controller and calls the callback when the process has
		* completed.
		*
		* Input Params: remote_bda - device address of name to retrieve
		* p_cb - callback function called when
		* BTM_CMD_STARTED is returned.
		* A pointer to tBTM_REMOTE_DEV_NAME is
		* passed to the callback.
		*
		* Returns
		* BTM_CMD_STARTED is returned if the request was successfully
		* sent to HCI.
		* BTM_BUSY if already in progress
		* BTM_UNKNOWN_ADDR if device address is bad
		* BTM_NO_RESOURCES if could not allocate resources to start
		* the command
		* BTM_WRONG_MODE if the device is not up.
		*
		******************************************************************************/
		#define BTM_EXT_RMT_NAME_TIMEOUT_MS (40 * 1000) /* 40 seconds */
		tBTM_STATUS BTM_ReadRemoteDeviceName(const RawAddress& remote_bda, tBTM_NAME_CMPL_CB* p_cb,
		tBT_TRANSPORT transport) {
		log::verbose("bd addr {}", remote_bda);
		/* Use LE transport when LE is the only available option */
		if (transport == BT_TRANSPORT_LE) {
		return btm_ble_read_remote_name(remote_bda, p_cb);
		}
		/* Use classic transport for BR/EDR and Dual Mode devices */
		return btm_initiate_rem_name(remote_bda, BTM_EXT_RMT_NAME_TIMEOUT_MS, p_cb);
		}

		/*******************************************************************************
		*
		* Function BTM_CancelRemoteDeviceName
		*
		* Description This function initiates the cancel request for the specified
		* remote device.
		*
		* Input Params: None
		*
		* Returns
		* BTM_CMD_STARTED is returned if the request was successfully
		* sent to HCI.
		* BTM_NO_RESOURCES if could not allocate resources to start
		* the command
		* BTM_WRONG_MODE if there is not an active remote name
		* request.
		*
		******************************************************************************/
		tBTM_STATUS BTM_CancelRemoteDeviceName(void) {
		log::verbose("");
		bool is_le;

		/* Make sure there is not already one in progress */
		if (!btm_cb.rnr.remname_active) {
		return BTM_WRONG_MODE;
		}

		if (com::android::bluetooth::flags::rnr_store_device_type()) {
		is_le = (btm_cb.rnr.remname_dev_type == BT_DEVICE_TYPE_BLE);
		} else {
		is_le = get_btm_client_interface().ble.BTM_UseLeLink(btm_cb.rnr.remname_bda);
		}

		if (is_le) {
		/* Cancel remote name request for LE device, and process remote name
		* callback. */
		btm_inq_rmt_name_failed_cancelled();
		} else {
		bluetooth::shim::ACL_CancelRemoteNameRequest(btm_cb.rnr.remname_bda);
		if (com::android::bluetooth::flags::rnr_reset_state_at_cancel()) {
		btm_process_remote_name(&btm_cb.rnr.remname_bda, nullptr, 0, HCI_ERR_UNSPECIFIED);
		}
		}
		return BTM_CMD_STARTED;
		}

		/*******************************************************************************
		*
		* Function BTM_InqDbRead
		@@ -1820,187 +1728,6 @@ static void btm_process_cancel_complete(tHCI_STATUS status, uint8_t mode) {
		BTIF_dm_report_inquiry_status_change(tBTM_INQUIRY_STATE::BTM_INQUIRY_CANCELLED);
		btm_process_inq_complete(status, mode);
		}
		/*******************************************************************************
		*
		* Function btm_initiate_rem_name
		*
		* Description This function looks initiates a remote name request. It is
		* called either by GAP or by the API call
		* BTM_ReadRemoteDeviceName.
		*
		* Input Params: remote_bda: Remote address to execute RNR
		* timeout_ms: Internal timeout to await response
		* * p_cb: Callback function called when
		* BTM_CMD_STARTED is returned.
		* A pointer to tBTM_REMOTE_DEV_NAME is
		* passed to the callback.
		*
		* Returns
		* BTM_CMD_STARTED is returned if the request was sent to HCI.
		* and the callback will be called.
		* BTM_BUSY if already in progress
		* BTM_NO_RESOURCES if could not allocate resources to start
		* the command
		* BTM_WRONG_MODE if the device is not up.
		*
		******************************************************************************/
		static uint16_t get_clock_offset_from_storage(const RawAddress& remote_bda) {
		int clock_offset_in_cfg = 0;
		return btif_get_device_clockoffset(remote_bda, &clock_offset_in_cfg)
		? static_cast<uint16_t>(clock_offset_in_cfg)
		: 0;
		}

		tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda, uint64_t timeout_ms,
		tBTM_NAME_CMPL_CB* p_cb) {
		/* Make sure the device is ready */
		if (!get_btm_client_interface().local.BTM_IsDeviceUp()) {
		return BTM_WRONG_MODE;
		}
		if (btm_cb.rnr.remname_active) {
		return BTM_BUSY;
		}

		uint16_t clock_offset = get_clock_offset_from_storage(remote_bda);
		uint8_t page_scan_rep_mode = HCI_PAGE_SCAN_REP_MODE_R1;
		uint8_t page_scan_mode = HCI_MANDATARY_PAGE_SCAN_MODE;

		/* If the database entry exists for the device, use its clock offset */
		tINQ_DB_ENT* p_i = btm_inq_db_find(remote_bda);
		if (p_i && (p_i->inq_info.results.inq_result_type & BT_DEVICE_TYPE_BREDR)) {
		tBTM_INQ_INFO* p_cur = &p_i->inq_info;
		clock_offset = p_cur->results.clock_offset \| BTM_CLOCK_OFFSET_VALID;
		if (0 == (p_cur->results.clock_offset & BTM_CLOCK_OFFSET_VALID)) {
		clock_offset = get_clock_offset_from_storage(remote_bda);
		}
		page_scan_rep_mode = p_cur->results.page_scan_rep_mode;
		if (com::android::bluetooth::flags::rnr_validate_page_scan_repetition_mode() &&
		page_scan_rep_mode >= HCI_PAGE_SCAN_REP_MODE_RESERVED_START) {
		log::info(
		"Invalid page scan repetition mode {} from remote_bda:{}, "
		"fallback to R1",
		page_scan_rep_mode, remote_bda);
		page_scan_rep_mode = HCI_PAGE_SCAN_REP_MODE_R1;
		}
		page_scan_mode = p_cur->results.page_scan_mode;
		}

		bluetooth::shim::ACL_RemoteNameRequest(remote_bda, page_scan_rep_mode, page_scan_mode,
		clock_offset);

		btm_cb.rnr.p_remname_cmpl_cb = p_cb;
		btm_cb.rnr.remname_bda = remote_bda;
		btm_cb.rnr.remname_dev_type = BT_DEVICE_TYPE_BREDR;
		btm_cb.rnr.remname_active = true;

		alarm_set_on_mloop(btm_cb.rnr.remote_name_timer, timeout_ms, btm_inq_remote_name_timer_timeout,
		NULL);

		return BTM_CMD_STARTED;
		}

		/*******************************************************************************
		*
		* Function btm_process_remote_name
		*
		* Description This function is called when a remote name is received from
		* the device. If remote names are cached, it updates the
		* inquiry database.
		*
		* Returns void
		*
		******************************************************************************/
		void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn, uint16_t /* evt_len */,
		tHCI_STATUS hci_status) {
		tBTM_REMOTE_DEV_NAME rem_name = {
		.status = BTM_BAD_VALUE_RET,
		.bd_addr = bda ? *bda : RawAddress::kEmpty,
		.remote_bd_name = {},
		.hci_status = hci_status,
		};

		bool on_le_link;
		if (com::android::bluetooth::flags::rnr_store_device_type()) {
		on_le_link = (btm_cb.rnr.remname_dev_type == BT_DEVICE_TYPE_BLE);
		} else {
		on_le_link = get_btm_client_interface().ble.BTM_UseLeLink(btm_cb.rnr.remname_bda);
		}

		/* If the inquire BDA and remote DBA are the same, then stop the timer and set
		* the active to false */
		if (btm_cb.rnr.remname_active) {
		if (rem_name.bd_addr == RawAddress::kEmpty \|\| rem_name.bd_addr == btm_cb.rnr.remname_bda) {
		log::info("RNR received expected name bd_addr:{} hci_status:{} le_link:{}",
		rem_name.bd_addr.ToRedactedStringForLogging(), hci_status_code_text(hci_status),
		on_le_link);

		if (on_le_link && hci_status == HCI_ERR_UNSPECIFIED) {
		btm_ble_cancel_remote_name(btm_cb.rnr.remname_bda);
		}
		alarm_cancel(btm_cb.rnr.remote_name_timer);
		/* Clean up and return the status if the command was not successful */
		/* Note: If part of the inquiry, the name is not stored, and the */
		/* inquiry complete callback is called. */

		if (hci_status == HCI_SUCCESS) {
		/* Copy the name from the data stream into the return structure */
		/* Note that even if it is not being returned, it is used as a */
		/* temporary buffer. */
		rem_name.status = BTM_SUCCESS;
		if (bdn) {
		bd_name_copy(rem_name.remote_bd_name, bdn);
		} else {
		log::warn("Received null name from remote device bd_addr:{}",
		rem_name.bd_addr.ToRedactedStringForLogging());
		}
		}
		/* Reset the remote BDA and call callback if possible */
		btm_cb.rnr.remname_active = false;
		btm_cb.rnr.remname_bda = RawAddress::kEmpty;
		btm_cb.rnr.remname_dev_type = BT_DEVICE_TYPE_UNKNOWN;

		tBTM_NAME_CMPL_CB* p_cb = btm_cb.rnr.p_remname_cmpl_cb;
		btm_cb.rnr.p_remname_cmpl_cb = nullptr;
		if (p_cb) {
		(p_cb)(&rem_name);
		}
		} else {
		log::warn("RNR received UNKNOWN name bd_addr:{} hci_status:{} le_link:{}",
		rem_name.bd_addr.ToRedactedStringForLogging(), hci_status_code_text(hci_status),
		on_le_link);
		}
		} else {
		log::info(
		"RNR received UNEXPECTED name bd_addr:{} inq_addr:{} hci_status:{} "
		"le_link:{} rnr_active:{}",
		rem_name.bd_addr.ToRedactedStringForLogging(),
		btm_cb.rnr.remname_bda.ToRedactedStringForLogging(), hci_status_code_text(hci_status),
		on_le_link, btm_cb.rnr.remname_active);
		}
		}

		void btm_inq_remote_name_timer_timeout(void* /* data */) { btm_inq_rmt_name_failed_cancelled(); }

		/*******************************************************************************
		*
		* Function btm_inq_rmt_name_failed_cancelled
		*
		* Description This function is if timeout expires or request is cancelled
		* while getting remote name. This is done for devices that
		* incorrectly do not report operation failure
		*
		* Returns void
		*
		******************************************************************************/
		void btm_inq_rmt_name_failed_cancelled(void) {
		log::error("remname_active={}", btm_cb.rnr.remname_active);

		if (btm_cb.rnr.remname_active) {
		btm_process_remote_name(&btm_cb.rnr.remname_bda, NULL, 0, HCI_ERR_UNSPECIFIED);
		}

		btm_sec_rmt_name_request_complete(NULL, NULL, HCI_ERR_UNSPECIFIED);
		}

		/*******************************************************************************
		*

system/stack/include/inq_hci_link_interface.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -24,9 +24,6 @@
		#include "stack/include/hci_error_code.h"
		#include "types/raw_address.h"

		void btm_process_remote_name(const RawAddress* bda, const BD_NAME name, uint16_t evt_len,
		tHCI_STATUS hci_status);

		void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode);

		void btm_acl_process_sca_cmpl_pkt(uint8_t len, uint8_t* data);

system/stack/rnr/remote_name_request.cc

+273 −0

File changed.

Preview size limit exceeded, changes collapsed.

system/stack/rnr/remote_name_request.h

+61 −0

Original line number	Diff line number	Diff line
		@@ -96,3 +96,64 @@ bool BTM_SecDeleteRmtNameNotifyCallback(tBTM_RMT_NAME_CALLBACK* p_callback);
		*
		******************************************************************************/
		bool BTM_IsRemoteNameKnown(const RawAddress& bd_addr, tBT_TRANSPORT transport);

		/*******************************************************************************
		*
		* Function BTM_ReadRemoteDeviceName
		*
		* Description This function initiates a remote device HCI command to the
		* controller and calls the callback when the process has
		* completed.
		*
		* Input Params: remote_bda - bluetooth device address of name to
		* retrieve
		* p_cb - callback function called when
		* remote name is received or when procedure
		* timed out.
		* transport - transport used to query the remote name
		* Returns
		* BTM_CMD_STARTED is returned if the request was successfully
		* sent to HCI.
		* BTM_BUSY if already in progress
		* BTM_UNKNOWN_ADDR if device address is bad
		* BTM_NO_RESOURCES if could not allocate resources to start
		* the command
		* BTM_WRONG_MODE if the device is not up.
		*
		******************************************************************************/
		tBTM_STATUS BTM_ReadRemoteDeviceName(const RawAddress& remote_bda, tBTM_NAME_CMPL_CB* p_cb,
		tBT_TRANSPORT transport);

		/*******************************************************************************
		*
		* Function BTM_CancelRemoteDeviceName
		*
		* Description This function initiates the cancel request for the specified
		* remote device.
		*
		* Input Params: None
		*
		* Returns
		* BTM_CMD_STARTED is returned if the request was successfully
		* sent to HCI.
		* BTM_NO_RESOURCES if could not allocate resources to start
		* the command
		* BTM_WRONG_MODE if there is not an active remote name
		* request.
		*
		******************************************************************************/
		tBTM_STATUS BTM_CancelRemoteDeviceName(void);

		/*******************************************************************************
		*
		* Function btm_process_remote_name
		*
		* Description This function is called when a remote name is received from
		* the device. If remote names are cached, it updates the
		* inquiry database.
		*
		* Returns void
		*
		******************************************************************************/
		void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn, uint16_t /* evt_len */,
		tHCI_STATUS hci_status);