Commit 278b07c9 authored by Vinayak Kariappa Chettimada's avatar Vinayak Kariappa Chettimada Committed by Stephanos Ioannidis
Browse files

Bluetooth: Controller: Fix addr type in PA sync established event 



The address type in the periodic adveritising sync
established event is incorrectly set to 0x01
(BT_ADDR_LE_RANDOM) when the address is a resolved one,
where it should have been BT_ADDR_LE_RANDOM_ID.

The address type has been fixed by offsetting by 2 to get
BT_ADDR_LE_PUBLIC_ID or BT_ADDR_LE_RANDOM_ID when the
address has been resolved.

Signed-off-by: default avatarVinayak Kariappa Chettimada <vich@nordicsemi.no>
parent 871611ee

subsys/bluetooth/controller/ll_sw/ull_scan_types.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ struct ll_scan_set { 
	struct {

		uint8_t sid;



		uint8_t adv_addr_type:1;

		uint8_t adv_addr_type:2;

		uint8_t filter_policy:1;

		uint8_t cancelled:1;

		uint8_t state:2;

subsys/bluetooth/controller/ll_sw/ull_sync.c

+7 −1
Original line number Diff line number Diff line
@@ -617,6 +617,9 @@ void ull_sync_setup_addr_check(struct ll_scan_set *scan, uint8_t addr_type, 
			 */

			scan->periodic.adv_addr_type = addr_type;



			/* Mark it as identity address from RPA (0x02, 0x03) */

			scan->periodic.adv_addr_type += 2U;



			/* Address matched */

			scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;

		}
@@ -633,6 +636,9 @@ void ull_sync_setup_addr_check(struct ll_scan_set *scan, uint8_t addr_type, 
		ll_rl_id_addr_get(rl_idx, &addr_type, addr);

		if ((addr_type == scan->periodic.adv_addr_type) &&

		    !memcmp(addr, scan->periodic.adv_addr, BDADDR_SIZE)) {

			/* Mark it as identity address from RPA (0x02, 0x03) */

			scan->periodic.adv_addr_type += 2U;



			/* Identity address matched */

			scan->periodic.state = LL_SYNC_STATE_ADDR_MATCH;

		}
@@ -698,7 +704,7 @@ void ull_sync_setup(struct ll_scan_set *scan, struct ll_scan_aux_set *aux, 
	/* Remember the peer address.

	 * NOTE: Peer identity address is copied here when privacy is enable.

	 */

	sync->peer_id_addr_type = scan->periodic.adv_addr_type;

	sync->peer_id_addr_type = scan->periodic.adv_addr_type & 0x01;

	(void)memcpy(sync->peer_id_addr, scan->periodic.adv_addr,

		     sizeof(sync->peer_id_addr));

#endif /* CONFIG_BT_CTLR_CHECK_SAME_PEER_SYNC ||

CRA Git | Maintained and supported by SUSTech CRA and CCSE