emulator: Initial Broacast Receiver
Luiz Augusto von Dentz
maintainerv2 cover emulator: Initial Broacast Receiver
From: Luiz Augusto von Dentz <[email protected]>
This implements the necessary commands to be able to emulate a Broadcast Receiver:
BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNCBT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC_CANCELBT_HCI_CMD_LE_PERIODIC_ADV_TERM_SYNCBT_HCI_EVT_LE_PER_SYNC_ESTABLISHEDBT_HCI_CMD_LE_BIG_CREATE_SYNCBT_HCI_CMD_LE_BIG_TERM_SYNC
v2: Adds support for BT_H4_ISO_PKT to bthost.
Luiz Augusto von Dentz (12):
monitor: Fix Create BIG PDU
btdev: Implement BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC
btdev: Implement BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC_CANCEL
btdev: Implement BT_HCI_CMD_LE_PERIODIC_ADV_TERM_SYNC
btdev: Send BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED when scan is initiated
btdev: Send BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED if remote start pa
monitor: Rename Periodic Advertising terms to PA/pa
btdev: Implements BT_HCI_CMD_LE_BIG_CREATE_SYNC
btdev: Implements BT_HCI_CMD_LE_BIG_TERM_SYNC
bthost: Add support for BT_H4_ISO_PKT
bthost: Add support for Periodic Advertising
bthost: Add support for Create BIG
emulator/btdev.c | 455 +++++++++++++++++++++++++++++++++++++++------- emulator/bthost.c | 392 ++++++++++++++++++++++++++++++++++----- emulator/bthost.h | 14 ++ emulator/hciemu.c | 1 + monitor/bt.h | 93 +++++----- monitor/packet.c | 113 ++++++------ 6 files changed, 862 insertions(+), 206 deletions(-)
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 1/12 monitor: Fix Create BIG PDU
From: Luiz Augusto von Dentz <[email protected]>
The PDU of Create BIG is actually fixed size as the num_bis is related to the number of indexes to be connected and not the BIS parameters.
--- emulator/btdev.c | 2 +- monitor/bt.h | 2 +- monitor/packet.c | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-)
emulator/btdev.c +1 -1
@@ -5692,10 +5692,10 @@ static int cmd_create_big_complete(struct btdev *dev, const void *data, uint8_t len) {const struct bt_hci_cmd_le_create_big *cmd = data; +const struct bt_hci_bis *bis = &cmd->bis;int i;for (i =0 ; i < cmd->num_bis; i++) { -const struct bt_hci_bis *bis = &cmd->bis[i];struct btdev_conn *conn; struct { struct bt_hci_evt_le_big_complete evt;
monitor/bt.h +1 -1
@@ -2758,7 +2758,7 @@ struct bt_hci_cmd_le_create_big {uint8_t handle;uint8_t adv_handle;uint8_t num_bis; -struct bt_hci_bis bis[0 ]; +struct bt_hci_bis bis; } __attribute__ ((packed));#define BT_HCI_CMD_LE_CREATE_BIG_TEST 0x2069
monitor/packet.c +2 -7
@@ -8200,10 +8200,8 @@ static void le_reject_cis_req_cmd(const void *data, uint8_t size)print_reason (cmd->reason); } -static void print_bis (const void *data,int i) +static void print_bis (const struct bt_hci_bis *bis) { -const struct bt_hci_bis *bis = data; -print_usec_interval ("SDU Interval" , bis->sdu_interval);print_field ("Maximum SDU size: %u" ,le16_to_cpu (bis->sdu)); print_field("Maximum Latency: %u ms (0x%4.4x)",
@@ -8223,10 +8221,7 @@ static void le_create_big_cmd(const void *data, uint8_t size)print_field ("Handle: 0x%2.2x" , cmd->handle);print_field ("Advertising Handle: 0x%2.2x" , cmd->adv_handle);print_field ("Number of BIS: %u" , cmd->num_bis); - - size -=sizeof (*cmd); - -print_list (cmd->bis, size, cmd->num_bis,sizeof (*cmd->bis), print_bis); +print_bis (&cmd->bis); }static void print_bis_test (const void *data,int i)
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 2/12 btdev: Implement BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds implementation of BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC generating BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED and BT_HCI_EVT_LE_PER_ADV_REPORT.
--- emulator/btdev.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 3 deletions(-)
emulator/btdev.c +96 -3
@@ -47,6 +47,7 @@#define ACL_HANDLE 42#define ISO_HANDLE 257#define SCO_HANDLE 257 +#define SYC_HANDLE 1struct hook {btdev_hook_func handler;
@@ -195,6 +196,7 @@ struct btdev {uint16_t le_periodic_max_interval;uint8_t le_periodic_data_len;uint8_t le_periodic_data[31 ]; +uint16_t le_periodic_sync_handle;uint8_t le_ltk[16 ];struct {struct bt_hci_cmd_le_set_cig_params params;
@@ -5294,8 +5296,99 @@ static int cmd_ext_create_conn_complete(struct btdev *dev, const void *data,static int cmd_per_adv_create_sync (struct btdev *dev,const void *data,uint8_t len) { -/* TODO */ -return -ENOTSUP ; +uint8_t status =BT_HCI_ERR_SUCCESS ; + +if (dev->le_periodic_sync_handle) + status =BT_HCI_ERR_MEM_CAPACITY_EXCEEDED ; +else + dev->le_periodic_sync_handle =SYC_HANDLE ; + +cmd_status (dev, status,BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC ); + +return 0 ; +} + +static void send_per_adv (struct btdev *dev,const struct btdev *remote, +uint8_t offset) +{ +struct __packed { +struct bt_hci_le_per_adv_report ev; +uint8_t data[31 ]; + } pdu; + +memset (&pdu.ev,0 ,sizeof (pdu.ev)); + pdu.ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); + pdu.ev.tx_power =127 ; + pdu.ev.rssi =127 ; + pdu.ev.cte_type =0x0ff ; + +if ((size_t ) remote->le_periodic_data_len - offset >sizeof (pdu.data)) { + pdu.ev.data_status =0x01 ; + pdu.ev.data_len =sizeof (pdu.data); + }else { + pdu.ev.data_status =0x00 ; + pdu.ev.data_len = remote->le_periodic_data_len - offset; + } + +memcpy (pdu.data, remote->le_periodic_data + offset, pdu.ev.data_len); + +le_meta_event (dev,BT_HCI_EVT_LE_PER_ADV_REPORT , &pdu, +sizeof (pdu.ev) + pdu.ev.data_len); + +if (pdu.ev.data_status ==0x01 ) { + offset += pdu.ev.data_len; +send_per_adv (dev, remote, offset); + } +} + +static void le_per_adv_sync_estabilished (struct btdev *dev, +const struct bt_hci_cmd_le_periodic_adv_create_sync *cmd, +struct btdev *remote,uint8_t status) +{ +struct bt_hci_evt_le_per_sync_established ev; + +memset (&ev,0 ,sizeof (ev)); + ev.status = status; + +if (status) { +le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev, +sizeof (ev)); +return ; + } + + ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); + ev.addr_type = cmd->addr_type; +memcpy (ev.addr, cmd->addr,sizeof (ev.addr)); + ev.phy =0x01 ; + ev.interval = remote->le_periodic_min_interval; + ev.clock_accuracy =0x07 ; + +le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev,sizeof (ev)); +send_per_adv (dev, remote,0 ); +} + +static int cmd_per_adv_create_sync_complete (struct btdev *dev,const void *data, +uint8_t len) +{ +const struct bt_hci_cmd_le_periodic_adv_create_sync *cmd = data; +struct btdev *remote; + +/* This command may be issued whether or not scanning is enabled and +* scanning may be enabled and disabled (see the LE Set Extended Scan +* Enable command) while this command is pending. However, +* synchronization can only occur when scanning is enabled. While +* scanning is disabled, no attempt to synchronize will take place. +*/ +if (!dev->scan_enable) +return 0 ; + + remote =find_btdev_by_bdaddr_type (cmd->addr, cmd->addr_type); +if (!remote || !remote->le_periodic_adv_enable) +return 0 ; + +le_per_adv_sync_estabilished (dev, cmd, remote,BT_HCI_ERR_SUCCESS ); + +return 0 ; } static int cmd_per_adv_create_sync_cancel(struct btdev *dev, const void *data,
@@ -5420,7 +5513,7 @@ done:CMD (BT_HCI_CMD_LE_EXT_CREATE_CONN , cmd_ext_create_conn, \ cmd_ext_create_conn_complete), \CMD (BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC , cmd_per_adv_create_sync, \ -NULL ), \ + cmd_per_adv_create_sync_complete), \CMD (BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC_CANCEL , \ cmd_per_adv_create_sync_cancel,NULL ), \ CMD(BT_HCI_CMD_LE_PERIODIC_ADV_TERM_SYNC, cmd_per_adv_term_sync, \
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 3/12 btdev: Implement BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC_CANCEL
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds implementation of BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC_CANCEL generating BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED if necessary.
--- emulator/btdev.c | 30 +++++++++++++++++++++++++++--- monitor/bt.h | 1 + 2 files changed, 28 insertions(+), 3 deletions(-)
emulator/btdev.c +27 -3
@@ -48,6 +48,7 @@#define ISO_HANDLE 257#define SCO_HANDLE 257#define SYC_HANDLE 1 +#define INV_HANDLE 0xffffstruct hook {btdev_hook_func handler;
@@ -5301,7 +5302,7 @@ static int cmd_per_adv_create_sync(struct btdev *dev, const void *data,if (dev->le_periodic_sync_handle) status =BT_HCI_ERR_MEM_CAPACITY_EXCEEDED ;else - dev->le_periodic_sync_handle =SYC_HANDLE ; + dev->le_periodic_sync_handle =INV_HANDLE ;cmd_status (dev, status,BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC );
@@ -5351,11 +5352,14 @@ static void le_per_adv_sync_estabilished(struct btdev *dev, ev.status = status;if (status) { + dev->le_periodic_sync_handle =0x0000 ;le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev,sizeof (ev));return ; } + dev->le_periodic_sync_handle =SYC_HANDLE ; + ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); ev.addr_type = cmd->addr_type;memcpy (ev.addr, cmd->addr,sizeof (ev.addr));
@@ -5394,8 +5398,28 @@ static int cmd_per_adv_create_sync_complete(struct btdev *dev, const void *data,static int cmd_per_adv_create_sync_cancel (struct btdev *dev,const void *data,uint8_t len) { -/* TODO */ -return -ENOTSUP ; +uint8_t status =BT_HCI_ERR_SUCCESS ; + +/* If the Host issues this command while no +* HCI_LE_Periodic_Advertising_Create_Sync command is pending, the +* Controller shall return the error code Command Disallowed (0x0C). +*/ +if (dev->le_periodic_sync_handle !=INV_HANDLE ) + status =BT_HCI_ERR_COMMAND_DISALLOWED ; + +cmd_complete (dev,BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC_CANCEL , + &status,sizeof (status)); + +/* After the HCI_Command_Complete is sent and if the cancellation was +* successful, the Controller sends an +* HCI_LE_Periodic_Advertising_Sync_Established event to the Host with +* the error code Operation Cancelled by Host (0x44). +*/ +if (!status) +le_per_adv_sync_estabilished (dev,NULL ,NULL , +BT_HCI_ERR_CANCELLED ); + +return 0 ; } static int cmd_per_adv_term_sync(struct btdev *dev, const void *data,
monitor/bt.h +1 -0
@@ -3660,6 +3660,7 @@ struct bt_hci_evt_le_req_peer_sca_complete {#define BT_HCI_ERR_ADV_TIMEOUT 0x3c#define BT_HCI_ERR_CONN_FAILED_TO_ESTABLISH 0x3e#define BT_HCI_ERR_UNKNOWN_ADVERTISING_ID 0x42 +#define BT_HCI_ERR_CANCELLED 0x44struct bt_l2cap_hdr {uint16_t len;
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 4/12 btdev: Implement BT_HCI_CMD_LE_PERIODIC_ADV_TERM_SYNC
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds implementation of BT_HCI_CMD_LE_PERIODIC_ADV_TERM_SYNC.
--- emulator/btdev.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
emulator/btdev.c +15 -2
@@ -5425,8 +5425,21 @@ static int cmd_per_adv_create_sync_cancel(struct btdev *dev, const void *data,static int cmd_per_adv_term_sync (struct btdev *dev,const void *data,uint8_t len) { -/* TODO */ -return -ENOTSUP ; +uint8_t status =BT_HCI_ERR_SUCCESS ; + +/* If the periodic advertising train corresponding to the Sync_Handle +* parameter does not exist, then the Controller shall return the error +* code Unknown Advertising Identifier (0x42). +*/ +if (dev->le_periodic_sync_handle !=SYC_HANDLE ) + status =BT_HCI_ERR_UNKNOWN_ADVERTISING_ID ; +else + dev->le_periodic_sync_handle =0x0000 ; + +cmd_complete (dev,BT_HCI_CMD_LE_PERIODIC_ADV_TERM_SYNC , + &status,sizeof (status)); + +return 0 ; }static int cmd_per_adv_add (struct btdev *dev,const void *data,uint8_t len)
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 5/12 btdev: Send BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED when scan is initiated
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This sends BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED if scan is initiated while BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC is pending.
--- emulator/btdev.c | 152 +++++++++++++++++++++++++++-------------------- 1 file changed, 86 insertions(+), 66 deletions(-)
emulator/btdev.c +86 -66
@@ -197,6 +197,7 @@ struct btdev {uint16_t le_periodic_max_interval;uint8_t le_periodic_data_len;uint8_t le_periodic_data[31 ]; +struct bt_hci_cmd_le_periodic_adv_create_sync pa_sync_cmd;uint16_t le_periodic_sync_handle;uint8_t le_ltk[16 ];struct {
@@ -5160,6 +5161,85 @@ static void scan_ext_adv(struct btdev *dev, struct btdev *remote) } } +static void send_per_adv (struct btdev *dev,const struct btdev *remote, +uint8_t offset) +{ +struct __packed { +struct bt_hci_le_per_adv_report ev; +uint8_t data[31 ]; + } pdu; + +memset (&pdu.ev,0 ,sizeof (pdu.ev)); + pdu.ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); + pdu.ev.tx_power =127 ; + pdu.ev.rssi =127 ; + pdu.ev.cte_type =0x0ff ; + +if ((size_t ) remote->le_periodic_data_len - offset >sizeof (pdu.data)) { + pdu.ev.data_status =0x01 ; + pdu.ev.data_len =sizeof (pdu.data); + }else { + pdu.ev.data_status =0x00 ; + pdu.ev.data_len = remote->le_periodic_data_len - offset; + } + +memcpy (pdu.data, remote->le_periodic_data + offset, pdu.ev.data_len); + +le_meta_event (dev,BT_HCI_EVT_LE_PER_ADV_REPORT , &pdu, +sizeof (pdu.ev) + pdu.ev.data_len); + +if (pdu.ev.data_status ==0x01 ) { + offset += pdu.ev.data_len; +send_per_adv (dev, remote, offset); + } +} + +static void le_per_adv_sync_estabilished (struct btdev *dev, +struct btdev *remote,uint8_t status) +{ +struct bt_hci_evt_le_per_sync_established ev; +struct bt_hci_cmd_le_periodic_adv_create_sync *cmd = &dev->pa_sync_cmd; + +memset (&ev,0 ,sizeof (ev)); + ev.status = status; + +if (status) { +memset (&dev->pa_sync_cmd,0 ,sizeof (dev->pa_sync_cmd)); + dev->le_periodic_sync_handle =0x0000 ; +le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev, +sizeof (ev)); +return ; + } + + dev->le_periodic_sync_handle =SYC_HANDLE ; + + ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); + ev.addr_type = cmd->addr_type; +memcpy (ev.addr, cmd->addr,sizeof (ev.addr)); + ev.phy =0x01 ; + ev.interval = remote->le_periodic_min_interval; + ev.clock_accuracy =0x07 ; + +memset (&dev->pa_sync_cmd,0 ,sizeof (dev->pa_sync_cmd)); + +le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev,sizeof (ev)); +send_per_adv (dev, remote,0 ); +} + +static void scan_per_adv (struct btdev *dev,struct btdev *remote) +{ +if (dev->le_periodic_sync_handle !=INV_HANDLE || + !remote->le_periodic_adv_enable) +return ; + + +if (remote !=find_btdev_by_bdaddr_type (dev->pa_sync_cmd.addr, + dev->pa_sync_cmd.addr_type)) +return ; + +le_per_adv_sync_estabilished (dev, remote,BT_HCI_ERR_SUCCESS ); +} +static int cmd_set_ext_scan_enable_complete (struct btdev *dev,const void *data,uint8_t len) {
@@ -5174,6 +5254,7 @@ static int cmd_set_ext_scan_enable_complete(struct btdev *dev, const void *data,continue ;scan_ext_adv (dev, btdev_list[i]); +scan_per_adv (dev, btdev_list[i]); }return 0 ;
@@ -5301,76 +5382,16 @@ static int cmd_per_adv_create_sync(struct btdev *dev, const void *data,if (dev->le_periodic_sync_handle) status =BT_HCI_ERR_MEM_CAPACITY_EXCEEDED ; -else +else { dev->le_periodic_sync_handle =INV_HANDLE ; +memcpy (&dev->pa_sync_cmd, data, len); + }cmd_status (dev, status,BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC );return 0 ; } -static void send_per_adv (struct btdev *dev,const struct btdev *remote, -uint8_t offset) -{ -struct __packed { -struct bt_hci_le_per_adv_report ev; -uint8_t data[31 ]; - } pdu; - -memset (&pdu.ev,0 ,sizeof (pdu.ev)); - pdu.ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); - pdu.ev.tx_power =127 ; - pdu.ev.rssi =127 ; - pdu.ev.cte_type =0x0ff ; - -if ((size_t ) remote->le_periodic_data_len - offset >sizeof (pdu.data)) { - pdu.ev.data_status =0x01 ; - pdu.ev.data_len =sizeof (pdu.data); - }else { - pdu.ev.data_status =0x00 ; - pdu.ev.data_len = remote->le_periodic_data_len - offset; - } - -memcpy (pdu.data, remote->le_periodic_data + offset, pdu.ev.data_len); - -le_meta_event (dev,BT_HCI_EVT_LE_PER_ADV_REPORT , &pdu, -sizeof (pdu.ev) + pdu.ev.data_len); - -if (pdu.ev.data_status ==0x01 ) { - offset += pdu.ev.data_len; -send_per_adv (dev, remote, offset); - } -} - -static void le_per_adv_sync_estabilished (struct btdev *dev, -const struct bt_hci_cmd_le_periodic_adv_create_sync *cmd, -struct btdev *remote,uint8_t status) -{ -struct bt_hci_evt_le_per_sync_established ev; - -memset (&ev,0 ,sizeof (ev)); - ev.status = status; - -if (status) { - dev->le_periodic_sync_handle =0x0000 ; -le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev, -sizeof (ev)); -return ; - } - - dev->le_periodic_sync_handle =SYC_HANDLE ; - - ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); - ev.addr_type = cmd->addr_type; -memcpy (ev.addr, cmd->addr,sizeof (ev.addr)); - ev.phy =0x01 ; - ev.interval = remote->le_periodic_min_interval; - ev.clock_accuracy =0x07 ; - -le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev,sizeof (ev)); -send_per_adv (dev, remote,0 ); -} -static int cmd_per_adv_create_sync_complete (struct btdev *dev,const void *data,uint8_t len) {
@@ -5390,7 +5411,7 @@ static int cmd_per_adv_create_sync_complete(struct btdev *dev, const void *data,if (!remote || !remote->le_periodic_adv_enable)return 0 ; -le_per_adv_sync_estabilished (dev, cmd, remote,BT_HCI_ERR_SUCCESS ); +le_per_adv_sync_estabilished (dev, remote,BT_HCI_ERR_SUCCESS );return 0 ; }
@@ -5416,8 +5437,7 @@ static int cmd_per_adv_create_sync_cancel(struct btdev *dev, const void *data,* the error code Operation Cancelled by Host (0x44). */ if (!status) -le_per_adv_sync_estabilished (dev,NULL ,NULL , -BT_HCI_ERR_CANCELLED ); +le_per_adv_sync_estabilished (dev,NULL ,BT_HCI_ERR_CANCELLED );return 0 ; }
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 6/12 btdev: Send BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED if remote start pa
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This sends BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED if remote device start to periodic advertise when BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC is pending.
--- emulator/btdev.c | 144 +++++++++++++++++++++++++---------------------- 1 file changed, 78 insertions(+), 66 deletions(-)
emulator/btdev.c +78 -66
@@ -5044,11 +5044,77 @@ static int cmd_set_per_adv_data(struct btdev *dev, const void *data,return 0 ; } +static void send_per_adv (struct btdev *dev,const struct btdev *remote, +uint8_t offset) +{ +struct __packed { +struct bt_hci_le_per_adv_report ev; +uint8_t data[31 ]; + } pdu; + +memset (&pdu.ev,0 ,sizeof (pdu.ev)); + pdu.ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); + pdu.ev.tx_power =127 ; + pdu.ev.rssi =127 ; + pdu.ev.cte_type =0x0ff ; + +if ((size_t ) remote->le_periodic_data_len - offset >sizeof (pdu.data)) { + pdu.ev.data_status =0x01 ; + pdu.ev.data_len =sizeof (pdu.data); + }else { + pdu.ev.data_status =0x00 ; + pdu.ev.data_len = remote->le_periodic_data_len - offset; + } + +memcpy (pdu.data, remote->le_periodic_data + offset, pdu.ev.data_len); + +le_meta_event (dev,BT_HCI_EVT_LE_PER_ADV_REPORT , &pdu, +sizeof (pdu.ev) + pdu.ev.data_len); + +if (pdu.ev.data_status ==0x01 ) { + offset += pdu.ev.data_len; +send_per_adv (dev, remote, offset); + } +} + +static void le_per_adv_sync_estabilished (struct btdev *dev, +struct btdev *remote,uint8_t status) +{ +struct bt_hci_evt_le_per_sync_established ev; +struct bt_hci_cmd_le_periodic_adv_create_sync *cmd = &dev->pa_sync_cmd; + +memset (&ev,0 ,sizeof (ev)); + ev.status = status; + +if (status) { +memset (&dev->pa_sync_cmd,0 ,sizeof (dev->pa_sync_cmd)); + dev->le_periodic_sync_handle =0x0000 ; +le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev, +sizeof (ev)); +return ; + } + + dev->le_periodic_sync_handle =SYC_HANDLE ; + + ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); + ev.addr_type = cmd->addr_type; +memcpy (ev.addr, cmd->addr,sizeof (ev.addr)); + ev.phy =0x01 ; + ev.interval = remote->le_periodic_min_interval; + ev.clock_accuracy =0x07 ; + +memset (&dev->pa_sync_cmd,0 ,sizeof (dev->pa_sync_cmd)); + +le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev,sizeof (ev)); +send_per_adv (dev, remote,0 ); +} +static int cmd_set_per_adv_enable (struct btdev *dev,const void *data,uint8_t len) {const struct bt_hci_cmd_le_set_periodic_adv_enable *cmd = data;uint8_t status; +int i;if (dev->le_periodic_adv_enable == cmd->enable) { status =BT_HCI_ERR_COMMAND_DISALLOWED ;
@@ -5060,6 +5126,18 @@ static int cmd_set_per_adv_enable(struct btdev *dev, const void *data,cmd_complete (dev,BT_HCI_CMD_LE_SET_PERIODIC_ADV_ENABLE , &status,sizeof (status)); +for (i =0 ; i <MAX_BTDEV_ENTRIES ; i++) { +struct btdev *remote = btdev_list[i]; + +if (!remote || remote == dev) +continue ; + +if (remote->le_scan_enable && + remote->le_periodic_sync_handle ==INV_HANDLE ) +le_per_adv_sync_estabilished (remote, dev, +BT_HCI_ERR_SUCCESS ); + } +return 0 ; }
@@ -5161,78 +5239,12 @@ static void scan_ext_adv(struct btdev *dev, struct btdev *remote) } } -static void send_per_adv (struct btdev *dev,const struct btdev *remote, -uint8_t offset) -{ -struct __packed { -struct bt_hci_le_per_adv_report ev; -uint8_t data[31 ]; - } pdu; - -memset (&pdu.ev,0 ,sizeof (pdu.ev)); - pdu.ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); - pdu.ev.tx_power =127 ; - pdu.ev.rssi =127 ; - pdu.ev.cte_type =0x0ff ; - -if ((size_t ) remote->le_periodic_data_len - offset >sizeof (pdu.data)) { - pdu.ev.data_status =0x01 ; - pdu.ev.data_len =sizeof (pdu.data); - }else { - pdu.ev.data_status =0x00 ; - pdu.ev.data_len = remote->le_periodic_data_len - offset; - } - -memcpy (pdu.data, remote->le_periodic_data + offset, pdu.ev.data_len); - -le_meta_event (dev,BT_HCI_EVT_LE_PER_ADV_REPORT , &pdu, -sizeof (pdu.ev) + pdu.ev.data_len); - -if (pdu.ev.data_status ==0x01 ) { - offset += pdu.ev.data_len; -send_per_adv (dev, remote, offset); - } -} - -static void le_per_adv_sync_estabilished (struct btdev *dev, -struct btdev *remote,uint8_t status) -{ -struct bt_hci_evt_le_per_sync_established ev; -struct bt_hci_cmd_le_periodic_adv_create_sync *cmd = &dev->pa_sync_cmd; - -memset (&ev,0 ,sizeof (ev)); - ev.status = status; - -if (status) { -memset (&dev->pa_sync_cmd,0 ,sizeof (dev->pa_sync_cmd)); - dev->le_periodic_sync_handle =0x0000 ; -le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev, -sizeof (ev)); -return ; - } - - dev->le_periodic_sync_handle =SYC_HANDLE ; - - ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); - ev.addr_type = cmd->addr_type; -memcpy (ev.addr, cmd->addr,sizeof (ev.addr)); - ev.phy =0x01 ; - ev.interval = remote->le_periodic_min_interval; - ev.clock_accuracy =0x07 ; - -memset (&dev->pa_sync_cmd,0 ,sizeof (dev->pa_sync_cmd)); - -le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev,sizeof (ev)); -send_per_adv (dev, remote,0 ); -} -static void scan_per_adv (struct btdev *dev,struct btdev *remote) {if (dev->le_periodic_sync_handle !=INV_HANDLE || !remote->le_periodic_adv_enable)return ; -if (remote !=find_btdev_by_bdaddr_type (dev->pa_sync_cmd.addr, dev->pa_sync_cmd.addr_type))return ;
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 7/12 monitor: Rename Periodic Advertising terms to PA/pa
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This renames the use of Periodic Advertising in the API to just PA.
--- emulator/btdev.c | 168 ++++++++++++++++++++++------------------------- monitor/bt.h | 82 +++++++++++------------ monitor/packet.c | 104 ++++++++++++++--------------- 3 files changed, 173 insertions(+), 181 deletions(-)
emulator/btdev.c +80 -88
@@ -191,14 +191,14 @@ struct btdev {uint8_t le_scan_filter_policy;uint8_t le_filter_dup;uint8_t le_adv_enable; -uint8_t le_periodic_adv_enable; -uint16_t le_periodic_adv_properties; -uint16_t le_periodic_min_interval; -uint16_t le_periodic_max_interval; -uint8_t le_periodic_data_len; -uint8_t le_periodic_data[31 ]; -struct bt_hci_cmd_le_periodic_adv_create_sync pa_sync_cmd; -uint16_t le_periodic_sync_handle; +uint8_t le_pa_enable; +uint16_t le_pa_properties; +uint16_t le_pa_min_interval; +uint16_t le_pa_max_interval; +uint8_t le_pa_data_len; +uint8_t le_pa_data[31 ]; +struct bt_hci_cmd_le_pa_create_sync pa_sync_cmd; +uint16_t le_pa_sync_handle;uint8_t le_ltk[16 ];struct {struct bt_hci_cmd_le_set_cig_params params;
@@ -5010,120 +5010,119 @@ static int cmd_clear_adv_sets(struct btdev *dev, const void *data,return 0 ; } -static int cmd_set_per_adv_params (struct btdev *dev,const void *data, +static int cmd_set_pa_params (struct btdev *dev,const void *data,uint8_t len) { -const struct bt_hci_cmd_le_set_periodic_adv_params *cmd = data; +const struct bt_hci_cmd_le_set_pa_params *cmd = data;uint8_t status; -if (dev->le_periodic_adv_enable) { +if (dev->le_pa_enable) { status =BT_HCI_ERR_COMMAND_DISALLOWED ; }else { status =BT_HCI_ERR_SUCCESS ; - dev->le_periodic_adv_properties =le16_to_cpu (cmd->properties); - dev->le_periodic_min_interval = cmd->min_interval; - dev->le_periodic_max_interval = cmd->max_interval; + dev->le_pa_properties =le16_to_cpu (cmd->properties); + dev->le_pa_min_interval = cmd->min_interval; + dev->le_pa_max_interval = cmd->max_interval; } -cmd_complete (dev,BT_HCI_CMD_LE_SET_PERIODIC_ADV_PARAMS , &status, +cmd_complete (dev,BT_HCI_CMD_LE_SET_PA_PARAMS , &status,sizeof (status));return 0 ; } -static int cmd_set_per_adv_data (struct btdev *dev,const void *data, +static int cmd_set_pa_data (struct btdev *dev,const void *data,uint8_t len) { -const struct bt_hci_cmd_le_set_periodic_adv_data *cmd = data; +const struct bt_hci_cmd_le_set_pa_data *cmd = data;uint8_t status =BT_HCI_ERR_SUCCESS ; - dev->le_periodic_data_len = cmd->data_len; -memcpy (dev->le_periodic_data, cmd->data,31 ); -cmd_complete (dev,BT_HCI_CMD_LE_SET_PERIODIC_ADV_DATA , &status, + dev->le_pa_data_len = cmd->data_len; +memcpy (dev->le_pa_data, cmd->data,31 ); +cmd_complete (dev,BT_HCI_CMD_LE_SET_PA_DATA , &status,sizeof (status));return 0 ; } -static void send_per_adv (struct btdev *dev,const struct btdev *remote, +static void send_pa (struct btdev *dev,const struct btdev *remote,uint8_t offset) {struct __packed { -struct bt_hci_le_per_adv_report ev; +struct bt_hci_le_pa_report ev;uint8_t data[31 ]; } pdu;memset (&pdu.ev,0 ,sizeof (pdu.ev)); - pdu.ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); + pdu.ev.handle =cpu_to_le16 (dev->le_pa_sync_handle); pdu.ev.tx_power =127 ; pdu.ev.rssi =127 ; pdu.ev.cte_type =0x0ff ; -if ((size_t ) remote->le_periodic_data_len - offset >sizeof (pdu.data)) { +if ((size_t ) remote->le_pa_data_len - offset >sizeof (pdu.data)) { pdu.ev.data_status =0x01 ; pdu.ev.data_len =sizeof (pdu.data); }else { pdu.ev.data_status =0x00 ; - pdu.ev.data_len = remote->le_periodic_data_len - offset; + pdu.ev.data_len = remote->le_pa_data_len - offset; } -memcpy (pdu.data, remote->le_periodic_data + offset, pdu.ev.data_len); +memcpy (pdu.data, remote->le_pa_data + offset, pdu.ev.data_len); -le_meta_event (dev,BT_HCI_EVT_LE_PER_ADV_REPORT , &pdu, +le_meta_event (dev,BT_HCI_EVT_LE_PA_REPORT , &pdu,sizeof (pdu.ev) + pdu.ev.data_len);if (pdu.ev.data_status ==0x01 ) { offset += pdu.ev.data_len; -send_per_adv (dev, remote, offset); +send_pa (dev, remote, offset); } } -static void le_per_adv_sync_estabilished (struct btdev *dev, -struct btdev *remote,uint8_t status) +static void le_pa_sync_estabilished (struct btdev *dev,struct btdev *remote, +uint8_t status) {struct bt_hci_evt_le_per_sync_established ev; -struct bt_hci_cmd_le_periodic_adv_create_sync *cmd = &dev->pa_sync_cmd; +struct bt_hci_cmd_le_pa_create_sync *cmd = &dev->pa_sync_cmd;memset (&ev,0 ,sizeof (ev)); ev.status = status;if (status) {memset (&dev->pa_sync_cmd,0 ,sizeof (dev->pa_sync_cmd)); - dev->le_periodic_sync_handle =0x0000 ; -le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev, + dev->le_pa_sync_handle =0x0000 ; +le_meta_event (dev,BT_HCI_EVT_LE_PA_SYNC_ESTABLISHED , &ev,sizeof (ev));return ; } - dev->le_periodic_sync_handle =SYC_HANDLE ; + dev->le_pa_sync_handle =SYC_HANDLE ; - ev.handle =cpu_to_le16 (dev->le_periodic_sync_handle); + ev.handle =cpu_to_le16 (dev->le_pa_sync_handle); ev.addr_type = cmd->addr_type;memcpy (ev.addr, cmd->addr,sizeof (ev.addr)); ev.phy =0x01 ; - ev.interval = remote->le_periodic_min_interval; + ev.interval = remote->le_pa_min_interval; ev.clock_accuracy =0x07 ;memset (&dev->pa_sync_cmd,0 ,sizeof (dev->pa_sync_cmd)); -le_meta_event (dev,BT_HCI_EVT_LE_PER_SYNC_ESTABLISHED , &ev,sizeof (ev)); -send_per_adv (dev, remote,0 ); +le_meta_event (dev,BT_HCI_EVT_LE_PA_SYNC_ESTABLISHED , &ev,sizeof (ev)); +send_pa (dev, remote,0 ); } -static int cmd_set_per_adv_enable (struct btdev *dev,const void *data, -uint8_t len) +static int cmd_set_pa_enable (struct btdev *dev,const void *data,uint8_t len) { -const struct bt_hci_cmd_le_set_periodic_adv_enable *cmd = data; +const struct bt_hci_cmd_le_set_pa_enable *cmd = data;uint8_t status;int i; -if (dev->le_periodic_adv_enable == cmd->enable) { +if (dev->le_pa_enable == cmd->enable) { status =BT_HCI_ERR_COMMAND_DISALLOWED ; }else { - dev->le_periodic_adv_enable = cmd->enable; + dev->le_pa_enable = cmd->enable; status =BT_HCI_ERR_SUCCESS ; } -cmd_complete (dev,BT_HCI_CMD_LE_SET_PERIODIC_ADV_ENABLE , &status, +cmd_complete (dev,BT_HCI_CMD_LE_SET_PA_ENABLE , &status,sizeof (status));for (i =0 ; i <MAX_BTDEV_ENTRIES ; i++) {
@@ -5133,8 +5132,8 @@ static int cmd_set_per_adv_enable(struct btdev *dev, const void *data,continue ;if (remote->le_scan_enable && - remote->le_periodic_sync_handle ==INV_HANDLE ) -le_per_adv_sync_estabilished (remote, dev, + remote->le_pa_sync_handle ==INV_HANDLE ) +le_pa_sync_estabilished (remote, dev,BT_HCI_ERR_SUCCESS ); }
@@ -5239,17 +5238,16 @@ static void scan_ext_adv(struct btdev *dev, struct btdev *remote) } } -static void scan_per_adv (struct btdev *dev,struct btdev *remote) +static void scan_pa (struct btdev *dev,struct btdev *remote) { -if (dev->le_periodic_sync_handle !=INV_HANDLE || - !remote->le_periodic_adv_enable) +if (dev->le_pa_sync_handle !=INV_HANDLE || !remote->le_pa_enable)return ;if (remote !=find_btdev_by_bdaddr_type (dev->pa_sync_cmd.addr, dev->pa_sync_cmd.addr_type))return ; -le_per_adv_sync_estabilished (dev, remote,BT_HCI_ERR_SUCCESS ); +le_pa_sync_estabilished (dev, remote,BT_HCI_ERR_SUCCESS ); } static int cmd_set_ext_scan_enable_complete(struct btdev *dev, const void *data,
@@ -5266,7 +5264,7 @@ static int cmd_set_ext_scan_enable_complete(struct btdev *dev, const void *data,continue ;scan_ext_adv (dev, btdev_list[i]); -scan_per_adv (dev, btdev_list[i]); +scan_pa (dev, btdev_list[i]); }return 0 ;
@@ -5387,27 +5385,26 @@ static int cmd_ext_create_conn_complete(struct btdev *dev, const void *data,return 0 ; } -static int cmd_per_adv_create_sync (struct btdev *dev,const void *data, -uint8_t len) +static int cmd_pa_create_sync (struct btdev *dev,const void *data,uint8_t len) {uint8_t status =BT_HCI_ERR_SUCCESS ; -if (dev->le_periodic_sync_handle) +if (dev->le_pa_sync_handle) status =BT_HCI_ERR_MEM_CAPACITY_EXCEEDED ;else { - dev->le_periodic_sync_handle =INV_HANDLE ; + dev->le_pa_sync_handle =INV_HANDLE ;memcpy (&dev->pa_sync_cmd, data, len); } -cmd_status (dev, status,BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC ); +cmd_status (dev, status,BT_HCI_CMD_LE_PA_CREATE_SYNC );return 0 ; } -static int cmd_per_adv_create_sync_complete (struct btdev *dev,const void *data, +static int cmd_pa_create_sync_complete (struct btdev *dev,const void *data,uint8_t len) { -const struct bt_hci_cmd_le_periodic_adv_create_sync *cmd = data; +const struct bt_hci_cmd_le_pa_create_sync *cmd = data;struct btdev *remote;/* This command may be issued whether or not scanning is enabled and
@@ -5420,15 +5417,15 @@ static int cmd_per_adv_create_sync_complete(struct btdev *dev, const void *data,return 0 ; remote =find_btdev_by_bdaddr_type (cmd->addr, cmd->addr_type); -if (!remote || !remote->le_periodic_adv_enable) +if (!remote || !remote->le_pa_enable)return 0 ; -le_per_adv_sync_estabilished (dev, remote,BT_HCI_ERR_SUCCESS ); +le_pa_sync_estabilished (dev, remote,BT_HCI_ERR_SUCCESS );return 0 ; } -static int cmd_per_adv_create_sync_cancel (struct btdev *dev,const void *data, +static int cmd_pa_create_sync_cancel (struct btdev *dev,const void *data,uint8_t len) {uint8_t status =BT_HCI_ERR_SUCCESS ;
@@ -5437,10 +5434,10 @@ static int cmd_per_adv_create_sync_cancel(struct btdev *dev, const void *data,* HCI_LE_Periodic_Advertising_Create_Sync command is pending, the * Controller shall return the error code Command Disallowed (0x0C). */ -if (dev->le_periodic_sync_handle !=INV_HANDLE ) +if (dev->le_pa_sync_handle !=INV_HANDLE ) status =BT_HCI_ERR_COMMAND_DISALLOWED ; -cmd_complete (dev,BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC_CANCEL , +cmd_complete (dev,BT_HCI_CMD_LE_PA_CREATE_SYNC_CANCEL , &status,sizeof (status));/* After the HCI_Command_Complete is sent and if the cancellation was
@@ -5449,13 +5446,12 @@ static int cmd_per_adv_create_sync_cancel(struct btdev *dev, const void *data,* the error code Operation Cancelled by Host (0x44). */ if (!status) -le_per_adv_sync_estabilished (dev,NULL ,BT_HCI_ERR_CANCELLED ); +le_pa_sync_estabilished (dev,NULL ,BT_HCI_ERR_CANCELLED );return 0 ; } -static int cmd_per_adv_term_sync (struct btdev *dev,const void *data, -uint8_t len) +static int cmd_pa_term_sync (struct btdev *dev,const void *data,uint8_t len) {uint8_t status =BT_HCI_ERR_SUCCESS ;
@@ -5463,36 +5459,36 @@ static int cmd_per_adv_term_sync(struct btdev *dev, const void *data,* parameter does not exist, then the Controller shall return the error * code Unknown Advertising Identifier (0x42). */ -if (dev->le_periodic_sync_handle !=SYC_HANDLE ) +if (dev->le_pa_sync_handle !=SYC_HANDLE ) status =BT_HCI_ERR_UNKNOWN_ADVERTISING_ID ;else - dev->le_periodic_sync_handle =0x0000 ; + dev->le_pa_sync_handle =0x0000 ; -cmd_complete (dev,BT_HCI_CMD_LE_PERIODIC_ADV_TERM_SYNC , +cmd_complete (dev,BT_HCI_CMD_LE_PA_TERM_SYNC , &status,sizeof (status));return 0 ; } -static int cmd_per_adv_add (struct btdev *dev,const void *data,uint8_t len) +static int cmd_pa_add (struct btdev *dev,const void *data,uint8_t len) {/* TODO */ return -ENOTSUP ; } -static int cmd_per_adv_remove (struct btdev *dev,const void *data,uint8_t len) +static int cmd_pa_remove (struct btdev *dev,const void *data,uint8_t len) {/* TODO */ return -ENOTSUP ; } -static int cmd_per_adv_clear (struct btdev *dev,const void *data,uint8_t len) +static int cmd_pa_clear (struct btdev *dev,const void *data,uint8_t len) {/* TODO */ return -ENOTSUP ; } -static int cmd_read_per_adv_list_size (struct btdev *dev,const void *data, +static int cmd_read_pa_list_size (struct btdev *dev,const void *data,uint8_t len) {/* TODO */
@@ -5571,28 +5567,24 @@ done: NULL), \CMD (BT_HCI_CMD_LE_REMOVE_ADV_SET , cmd_remove_adv_set,NULL ), \CMD (BT_HCI_CMD_LE_CLEAR_ADV_SETS , cmd_clear_adv_sets,NULL ), \ -CMD (BT_HCI_CMD_LE_SET_PERIODIC_ADV_PARAMS , cmd_set_per_adv_params, \ -NULL ), \ -CMD (BT_HCI_CMD_LE_SET_PERIODIC_ADV_DATA , cmd_set_per_adv_data,NULL ), \ -CMD (BT_HCI_CMD_LE_SET_PERIODIC_ADV_ENABLE , cmd_set_per_adv_enable, \ +CMD (BT_HCI_CMD_LE_SET_PA_PARAMS , cmd_set_pa_params, \NULL ), \ +CMD (BT_HCI_CMD_LE_SET_PA_DATA , cmd_set_pa_data,NULL ), \ +CMD (BT_HCI_CMD_LE_SET_PA_ENABLE , cmd_set_pa_enable,NULL ), \CMD (BT_HCI_CMD_LE_SET_EXT_SCAN_PARAMS , cmd_set_ext_scan_params,NULL ), \CMD (BT_HCI_CMD_LE_SET_EXT_SCAN_ENABLE , cmd_set_ext_scan_enable, \ cmd_set_ext_scan_enable_complete), \CMD (BT_HCI_CMD_LE_EXT_CREATE_CONN , cmd_ext_create_conn, \ cmd_ext_create_conn_complete), \ -CMD (BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC , cmd_per_adv_create_sync, \ - cmd_per_adv_create_sync_complete), \ -CMD (BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC_CANCEL , \ - cmd_per_adv_create_sync_cancel,NULL ), \ -CMD (BT_HCI_CMD_LE_PERIODIC_ADV_TERM_SYNC , cmd_per_adv_term_sync, \ -NULL ), \ -CMD (BT_HCI_CMD_LE_ADD_DEV_PERIODIC_ADV_LIST , cmd_per_adv_add,NULL ), \ -CMD (BT_HCI_CMD_LE_REMOVE_DEV_PERIODIC_ADV_LIST , cmd_per_adv_remove, \ +CMD (BT_HCI_CMD_LE_PA_CREATE_SYNC , cmd_pa_create_sync, \ + cmd_pa_create_sync_complete), \ +CMD (BT_HCI_CMD_LE_PA_CREATE_SYNC_CANCEL , cmd_pa_create_sync_cancel, \NULL ), \ -CMD (BT_HCI_CMD_LE_CLEAR_PERIODIC_ADV_LIST , cmd_per_adv_clear,NULL ), \ -CMD (BT_HCI_CMD_LE_READ_PERIODIC_ADV_LIST_SIZE , \ - cmd_read_per_adv_list_size,NULL ), \ +CMD (BT_HCI_CMD_LE_PA_TERM_SYNC , cmd_pa_term_sync,NULL ), \ +CMD (BT_HCI_CMD_LE_ADD_DEV_PA_LIST , cmd_pa_add,NULL ), \ +CMD (BT_HCI_CMD_LE_REMOVE_DEV_PA_LIST , cmd_pa_remove,NULL ), \ +CMD (BT_HCI_CMD_LE_CLEAR_PA_LIST , cmd_pa_clear,NULL ), \ +CMD (BT_HCI_CMD_LE_READ_PA_LIST_SIZE , cmd_read_pa_list_size,NULL ), \CMD (BT_HCI_CMD_LE_READ_TX_POWER , cmd_read_tx_power,NULL ), \CMD (BT_HCI_CMD_LE_SET_PRIV_MODE , cmd_set_privacy_mode,NULL )
monitor/bt.h +41 -41
224 lines not on this page · raw message
monitor/packet.c +52 -52
293 lines not on this page · raw message
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 8/12 btdev: Implements BT_HCI_CMD_LE_BIG_CREATE_SYNC
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This sends BT_HCI_EVT_LE_BIG_SYNC_ESTABLISHED when handling BT_HCI_CMD_LE_BIG_CREATE_SYNC.
--- emulator/btdev.c | 158 ++++++++++++++++++++++++++++++++++++++++++++--- monitor/bt.h | 1 + 2 files changed, 150 insertions(+), 9 deletions(-)
emulator/btdev.c +149 -9
@@ -40,6 +40,7 @@#define AL_SIZE 16#define RL_SIZE 16#define CIS_SIZE 3 +#define BIS_SIZE 3#define has_bredr (btdev) (!((btdev)->features[4] & 0x20))#define has_le (btdev) (!!((btdev)->features[4] & 0x40))
@@ -65,6 +66,7 @@ struct btdev_conn {uint8_t type;struct btdev *dev;struct btdev_conn *link; +void *data; };struct btdev_al {
@@ -199,6 +201,7 @@ struct btdev {uint8_t le_pa_data[31 ];struct bt_hci_cmd_le_pa_create_sync pa_sync_cmd;uint16_t le_pa_sync_handle; +uint8_t big_handle;uint8_t le_ltk[16 ];struct {struct bt_hci_cmd_le_set_cig_params params;
@@ -690,6 +693,7 @@ static void conn_remove(void *data)queue_remove (conn->dev->conns, conn); +free (conn->data);free (conn); }
@@ -1121,9 +1125,65 @@ static struct btdev_conn *conn_add_cis(struct btdev_conn *acl, uint16_t handle)return conn_link (acl->dev, acl->link->dev, handle,HCI_ISODATA_PKT ); } -static struct btdev_conn *conn_add_bis (struct btdev *dev,uint16_t handle) +static struct btdev_conn *conn_add_bis (struct btdev *dev,uint16_t handle, +const struct bt_hci_bis *bis) { -return conn_new (dev, handle,HCI_ISODATA_PKT ); +struct btdev_conn *conn; + + conn =conn_new (dev, handle,HCI_ISODATA_PKT ); +if (!conn) +return conn; + + conn->data =util_memdup (bis,sizeof (*bis)); + +return conn; +} + +static struct btdev_conn *find_bis_index (struct btdev *remote,uint8_t index) +{ +struct btdev_conn *conn; +const struct queue_entry *entry; + +for (entry =queue_get_entries (remote->conns); entry; + entry = entry->next) { + conn = entry->data; + +/* Skip if not a broadcast */ +if (conn->type !=HCI_ISODATA_PKT || conn->link) +continue ; + +if (!index) +return conn; + + index--; + } + +return NULL ; +} + +static struct btdev_conn *conn_link_bis (struct btdev *dev,struct btdev *remote, +uint8_t index) +{ +struct btdev_conn *conn; +struct btdev_conn *bis; + + bis =find_bis_index (remote, index); +if (!bis) +return NULL ; + + conn =conn_add_bis (dev,ISO_HANDLE , bis->data); +if (!conn) +return NULL ; + + bis->link = conn; + conn->link = bis; + +util_debug (dev->debug_callback, dev->debug_data, +"bis %p handle 0x%04x" , bis, bis->handle); +util_debug (dev->debug_callback, dev->debug_data, +"conn %p handle 0x%04x" , conn, conn->handle); + +return conn; } static void conn_complete(struct btdev *btdev,
@@ -5103,8 +5163,6 @@ static void le_pa_sync_estabilished(struct btdev *dev, struct btdev *remote, ev.interval = remote->le_pa_min_interval; ev.clock_accuracy =0x07 ; -memset (&dev->pa_sync_cmd,0 ,sizeof (dev->pa_sync_cmd)); -le_meta_event (dev,BT_HCI_EVT_LE_PA_SYNC_ESTABLISHED , &ev,sizeof (ev));send_pa (dev, remote,0 ); }
@@ -5858,14 +5916,14 @@ static int cmd_create_big_complete(struct btdev *dev, const void *data,memset (&pdu,0 ,sizeof (pdu)); - conn =conn_add_bis (dev,ISO_HANDLE ); + conn =conn_add_bis (dev,ISO_HANDLE , bis);if (!conn) { pdu.evt.status =BT_HCI_ERR_MEM_CAPACITY_EXCEEDED ; goto done; } pdu.evt.handle = cmd->handle; - pdu.evt.num_bis =0x01 ; + pdu.evt.num_bis++; pdu.evt.phy = bis->phy; pdu.evt.max_pdu = bis->sdu;memcpy (pdu.evt.sync_delay, bis->sdu_interval,3 );
@@ -5910,8 +5968,89 @@ static int cmd_term_big_complete(struct btdev *dev, const void *data,static int cmd_big_create_sync (struct btdev *dev,const void *data,uint8_t len) { -/* TODO */ -return -ENOTSUP ; +const struct bt_hci_cmd_le_big_create_sync *cmd = data; +uint8_t status =BT_HCI_ERR_SUCCESS ; + +/* If the Sync_Handle does not exist, the Controller shall return the +* error code Unknown Advertising Identifier (0x42). +*/ +if (dev->le_pa_sync_handle !=le16_to_cpu (cmd->sync_handle)) + status =BT_HCI_ERR_UNKNOWN_ADVERTISING_ID ; + +/* If the Host sends this command with a BIG_Handle that is already +* allocated, the Controller shall return the error code Command +* Disallowed (0x0C). +*/ +if (dev->big_handle == cmd->handle) + status =BT_HCI_ERR_COMMAND_DISALLOWED ; + +/* If the Num_BIS parameter is greater than the total number of BISes +* in the BIG, the Controller shall return the error code Unsupported +* Feature or Parameter Value (0x11). +*/ +if (cmd->num_bis != len -sizeof (*cmd)) + status =BT_HCI_ERR_UNSUPPORTED_FEATURE ; + +if (status) +return status; + +cmd_status (dev, status,BT_HCI_CMD_LE_BIG_CREATE_SYNC ); + +return status; +} + +static int cmd_big_create_sync_complete (struct btdev *dev,const void *data, +uint8_t len) +{ +const struct bt_hci_cmd_le_big_create_sync *cmd = data; +struct __packed { +struct bt_hci_evt_le_big_sync_estabilished ev; +uint16_t bis[BIS_SIZE ]; + } pdu; +struct btdev *remote; +struct btdev_conn *conn =NULL ; +struct bt_hci_bis *bis; +int i; + + remote =find_btdev_by_bdaddr_type (dev->pa_sync_cmd.addr, + dev->pa_sync_cmd.addr_type); +if (!remote) +return 0 ; + +memset (&pdu.ev,0 ,sizeof (pdu.ev)); + +for (i =0 ; i < cmd->num_bis; i++) { + conn =conn_link_bis (dev, remote, i); +if (!conn) +break ; + + pdu.bis[i] =cpu_to_le16 (conn->handle); + } + +if (i != cmd->num_bis || !conn) { + pdu.ev.status =BT_HCI_ERR_MEM_CAPACITY_EXCEEDED ; +le_meta_event (dev,BT_HCI_EVT_LE_BIG_SYNC_ESTABILISHED , &pdu, +sizeof (pdu.ev)); +return 0 ; + } + + dev->big_handle = cmd->handle; + bis = conn->data; + + pdu.ev.handle = cmd->handle; +memcpy (pdu.ev.latency, bis->sdu_interval,sizeof (pdu.ev.interval)); + pdu.ev.nse =0x01 ; + pdu.ev.bn =0x01 ; + pdu.ev.pto =0x00 ; + pdu.ev.irc =0x01 ; + pdu.ev.max_pdu = bis->sdu; + pdu.ev.interval = bis->latency; + pdu.ev.num_bis = cmd->num_bis; + +le_meta_event (dev,BT_HCI_EVT_LE_BIG_SYNC_ESTABILISHED , &pdu, +sizeof (pdu.ev) + (cmd->num_bis *sizeof (uint16_t ))); + +return 0 ; }static int cmd_big_term_sync (struct btdev *dev,const void *data,uint8_t len)
@@ -6125,7 +6264,8 @@ static int cmd_config_data_path(struct btdev *dev, const void *data, cmd_create_big_complete), \CMD (BT_HCI_CMD_LE_CREATE_BIG_TEST , cmd_create_big_test,NULL ), \CMD (BT_HCI_CMD_LE_TERM_BIG , cmd_term_big, cmd_term_big_complete), \ -CMD (BT_HCI_CMD_LE_BIG_CREATE_SYNC , cmd_big_create_sync,NULL ), \ +CMD (BT_HCI_CMD_LE_BIG_CREATE_SYNC , cmd_big_create_sync, \ + cmd_big_create_sync_complete), \CMD (BT_HCI_CMD_LE_BIG_TERM_SYNC , cmd_big_term_sync,NULL ), \CMD (BT_HCI_CMD_LE_REQ_PEER_SCA , cmd_req_peer_sca,NULL ), \ CMD(BT_HCI_CMD_LE_SETUP_ISO_PATH, cmd_setup_iso_path, NULL), \
monitor/bt.h +1 -0
@@ -2797,6 +2797,7 @@ struct bt_hci_cmd_le_term_big {#define BT_HCI_CMD_LE_BIG_CREATE_SYNC 0x206b#define BT_HCI_BIT_LE_BIG_CREATE_SYNC BT_HCI_CMD_BIT(43, 0)struct bt_hci_bis_sync { +uint8_t index; } __attribute__ ((packed));struct bt_hci_cmd_le_big_create_sync {
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 9/12 btdev: Implements BT_HCI_CMD_LE_BIG_TERM_SYNC
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This sends BT_HCI_EVT_DISCONNECT_COMPLETE when handling BT_HCI_CMD_LE_BIG_TERM_SYNC.
--- emulator/btdev.c | 39 +++++++++++++++++++++++++++++++++++++-- monitor/bt.h | 5 +++++ 2 files changed, 42 insertions(+), 2 deletions(-)
emulator/btdev.c +37 -2
@@ -6055,8 +6055,43 @@ static int cmd_big_create_sync_complete(struct btdev *dev, const void *data,static int cmd_big_term_sync (struct btdev *dev,const void *data,uint8_t len) { -/* TODO */ -return -ENOTSUP ; +const struct bt_hci_cmd_le_big_term_sync *cmd = data; +struct bt_hci_rsp_le_big_term_sync rsp; +const struct queue_entry *entry; + +memset (&rsp,0 ,sizeof (rsp)); + +/* If the Host issues this command with a BIG_Handle that does not +* exist, the Controller shall return the error code Unknown +* Advertising Identifier (0x42). +*/ +if (dev->big_handle != cmd->handle) { + rsp.status =BT_HCI_ERR_UNKNOWN_ADVERTISING_ID ; + goto done; + } + + rsp.status =BT_HCI_ERR_COMMAND_DISALLOWED ; + rsp.handle = cmd->handle; + +/* Cleanup existing connections */ +for (entry =queue_get_entries (dev->conns); entry; + entry = entry->next) { +struct btdev_conn *conn = entry->data; + +if (!conn->data) +continue ; + + rsp.status =BT_HCI_ERR_SUCCESS ; +disconnect_complete (dev, conn->handle,BT_HCI_ERR_SUCCESS , +0x16 ); + +conn_remove (conn); + } + +done: +cmd_complete (dev,BT_HCI_CMD_LE_BIG_TERM_SYNC , &rsp,sizeof (rsp)); + +return 0 ; }static int cmd_req_peer_sca (struct btdev *dev,const void *data,uint8_t len)
monitor/bt.h +5 -0
@@ -2817,6 +2817,11 @@ struct bt_hci_cmd_le_big_term_sync {uint8_t handle; } __attribute__ ((packed)); +struct bt_hci_rsp_le_big_term_sync { +uint8_t status; +uint8_t handle; +} __attribute__ ((packed)); +#define BT_HCI_CMD_LE_REQ_PEER_SCA 0x206d#define BT_HCI_BIT_LE_REQ_PEER_SCA BT_HCI_CMD_BIT(43, 2)struct bt_hci_cmd_le_req_peer_sca {
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 10/12 bthost: Add support for BT_H4_ISO_PKT
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds sending and receiving BT_H4_ISO_PKT packets.
--- emulator/bthost.c | 356 ++++++++++++++++++++++++++++++++++++++++------ emulator/bthost.h | 11 ++ emulator/hciemu.c | 1 + monitor/bt.h | 2 + 4 files changed, 328 insertions(+), 42 deletions(-)
emulator/bthost.c +314 -42
@@ -37,6 +37,9 @@#define acl_handle (h) (h & 0x0fff)#define acl_flags (h) (h >> 12) +#define iso_flags_pb (f) (f & 0x0003) +#define iso_data_len_pack (h, f) ((uint16_t) ((h) | ((f) << 14))) +#define L2CAP_FEAT_FIXED_CHAN 0x00000080#define L2CAP_FC_SIG_BREDR 0x02#define L2CAP_FC_SMP_BREDR 0x80
@@ -131,6 +134,11 @@ struct rfcomm_chan_hook {struct rfcomm_chan_hook *next; }; +struct iso_hook { +bthost_cid_hook_func_t func; +void *user_data; +}; +struct btconn {uint16_t handle;uint8_t bdaddr[6 ];
@@ -142,8 +150,12 @@ struct btconn {struct rcconn *rcconns;struct cid_hook *cid_hooks;struct rfcomm_chan_hook *rfcomm_chan_hooks; +struct iso_hook *iso_hook;struct btconn *next;void *smp_data; +uint16_t recv_len; +uint16_t data_len; +void *recv_data; };struct l2conn {
@@ -203,9 +215,6 @@ struct bthost {uint8_t bdaddr[6 ];uint8_t features[8 ];bthost_send_func send_handler; -uint16_t acl_len; -uint16_t l2_len; -void *acl_data;void *send_data;struct cmd_queue cmd_q;uint8_t ncmd;
@@ -214,6 +223,8 @@ struct bthost {void *cmd_complete_data;bthost_new_conn_cb new_conn_cb;void *new_conn_data; +bthost_new_conn_cb new_iso_cb; +void *new_iso_data;struct rfcomm_connection_data *rfcomm_conn_data;struct l2cap_conn_cb_data *new_l2cap_conn_data;struct rfcomm_conn_cb_data *new_rfcomm_conn_data;
@@ -295,6 +306,8 @@ static void btconn_free(struct btconn *conn)free (hook); } +free (conn->iso_hook); +free (conn->recv_data);free (conn); }
@@ -494,7 +507,6 @@ void bthost_destroy(struct bthost *bthost)queue_destroy (bthost->le_ext_adv, le_ext_adv_free); -free (bthost->acl_data);free (bthost); }
@@ -663,6 +675,28 @@ void bthost_add_cid_hook(struct bthost *bthost, uint16_t handle, uint16_t cid, conn->cid_hooks = hook; } +void bthost_add_iso_hook (struct bthost *bthost,uint16_t handle, +bthost_cid_hook_func_t func,void *user_data) +{ +struct iso_hook *hook; +struct btconn *conn; + + conn =bthost_find_conn (bthost, handle); +if (!conn || conn->iso_hook) +return ; + + hook =malloc (sizeof (*hook)); +if (!hook) +return ; + +memset (hook,0 ,sizeof (*hook)); + + hook->func = func; + hook->user_data = user_data; + + conn->iso_hook = hook; +} +void bthost_send_cid (struct bthost *bthost,uint16_t handle,uint16_t cid,const void *data,uint16_t len) {
@@ -687,6 +721,52 @@ void bthost_send_cid_v(struct bthost *bthost, uint16_t handle, uint16_t cid,send_iov (bthost, handle, cid, iov, iovcnt); } +static void send_iso (struct bthost *bthost,uint16_t handle, +const struct iovec *iov,int iovcnt) +{ +struct bt_hci_iso_hdr iso_hdr; +struct bt_hci_iso_data_start data_hdr; +uint8_t pkt =BT_H4_ISO_PKT ; +struct iovec pdu[3 + iovcnt]; +int i, len =0 ; +static uint16_t sn; + +for (i =0 ; i < iovcnt; i++) { + pdu[3 + i].iov_base = iov[i].iov_base; + pdu[3 + i].iov_len = iov[i].iov_len; + len += iov[i].iov_len; + } + + pdu[0 ].iov_base = &pkt; + pdu[0 ].iov_len =sizeof (pkt); + + iso_hdr.handle =acl_handle_pack (handle,0x02 ); + iso_hdr.dlen =cpu_to_le16 (len +sizeof (data_hdr)); + + pdu[1 ].iov_base = &iso_hdr; + pdu[1 ].iov_len =sizeof (iso_hdr); + + data_hdr.sn =cpu_to_le16 (sn++); + data_hdr.slen =cpu_to_le16 (iso_data_len_pack (len,0 )); + + pdu[2 ].iov_base = &data_hdr; + pdu[2 ].iov_len =sizeof (data_hdr); + +send_packet (bthost, pdu,3 + iovcnt); +} + +void bthost_send_iso (struct bthost *bthost,uint16_t handle, +const struct iovec *iov,int iovcnt) +{ +struct btconn *conn; + + conn =bthost_find_conn (bthost, handle); +if (!conn) +return ; + +send_iso (bthost, handle, iov, iovcnt); +} +bool bthost_l2cap_req (struct bthost *bthost,uint16_t handle,uint8_t code,const void *data,uint16_t len,bthost_l2cap_rsp_cb cb,void *user_data)
@@ -1337,6 +1417,40 @@ static void evt_le_ltk_request(struct bthost *bthost, const void *data, sizeof(cp)); } +static void init_iso (struct bthost *bthost,uint16_t handle, +const uint8_t *bdaddr,uint8_t addr_type) +{ +struct btconn *conn; + +bthost_debug (bthost,"ISO handle 0x%4.4x" , handle); + + conn =malloc (sizeof (*conn)); +if (!conn) +return ; + +memset (conn,0 ,sizeof (*conn)); + conn->handle = handle; +memcpy (conn->bdaddr, bdaddr,6 ); + conn->addr_type = addr_type; + + conn->next = bthost->conns; + bthost->conns = conn; + +if (bthost->new_iso_cb) + bthost->new_iso_cb (handle, bthost->new_iso_data); +} + +static void evt_le_cis_established (struct bthost *bthost,const void *data, +uint8_t size) +{ +const struct bt_hci_evt_le_cis_established *ev = data; + +if (ev->status) +return ; + +init_iso (bthost, ev->conn_handle,BDADDR_ANY ->b,BDADDR_LE_PUBLIC ); +} +static void evt_le_cis_req (struct bthost *bthost,const void *data,uint8_t len) {const struct bt_hci_evt_le_cis_req *ev = data;
@@ -1384,6 +1498,38 @@ static void evt_le_ext_adv_report(struct bthost *bthost, const void *data, } } +static void evt_le_big_complete (struct bthost *bthost,const void *data, +uint8_t size) +{ +const struct bt_hci_evt_le_big_complete *ev = data; +int i; + +if (ev->status) +return ; + +for (i =0 ; i < ev->num_bis; i++) { +uint16_t handle =le16_to_cpu (ev->bis_handle[i]); + +init_iso (bthost, handle,BDADDR_ANY ->b,BDADDR_LE_PUBLIC ); + } +} + +static void evt_le_big_sync_established (struct bthost *bthost, +const void *data,uint8_t size) +{ +const struct bt_hci_evt_le_big_sync_estabilished *ev = data; +int i; + +if (ev->status) +return ; + +for (i =0 ; i < ev->num_bis; i++) { +uint16_t handle =le16_to_cpu (ev->bis[i]); + +init_iso (bthost, handle,BDADDR_ANY ->b,BDADDR_LE_PUBLIC ); + } +} +static void evt_le_meta_event (struct bthost *bthost,const void *data,uint8_t len) {
@@ -1393,7 +1539,7 @@ static void evt_le_meta_event(struct bthost *bthost, const void *data,if (len <1 )return ; -bthost_debug (bthost,"event 0x%02x" , *event); +bthost_debug (bthost,"meta event 0x%02x" , *event);switch (*event) {case BT_HCI_EVT_LE_CONN_COMPLETE :
@@ -1414,9 +1560,18 @@ static void evt_le_meta_event(struct bthost *bthost, const void *data,case BT_HCI_EVT_LE_EXT_ADV_REPORT :evt_le_ext_adv_report (bthost, evt_data, len -1 );break ; +case BT_HCI_EVT_LE_CIS_ESTABLISHED : +evt_le_cis_established (bthost, evt_data, len -1 ); +break ;case BT_HCI_EVT_LE_CIS_REQ :evt_le_cis_req (bthost, evt_data, len -1 );break ; +case BT_HCI_EVT_LE_BIG_COMPLETE : +evt_le_big_complete (bthost, evt_data, len -1 ); +break ; +case BT_HCI_EVT_LE_BIG_SYNC_ESTABILISHED : +evt_le_big_sync_established (bthost, evt_data, len -1 ); +break ;default :bthost_debug (bthost,"Unsupported LE Meta event 0x%2.2x" , *event);
@@ -2437,22 +2592,14 @@ static void process_rfcomm(struct bthost *bthost, struct btconn *conn, } } -static void process_l2cap (struct bthost *bthost,uint16_t handle, +static void process_l2cap (struct bthost *bthost,struct btconn *conn,const void *data,uint16_t len) {const struct bt_l2cap_hdr *l2_hdr = data;struct cid_hook *hook; -struct btconn *conn;struct l2conn *l2conn;uint16_t cid, l2_len; - conn =bthost_find_conn (bthost, handle); -if (!conn) { -bthost_debug (bthost,"ACL data for unknown handle 0x%04x" , - handle); -return ; - } - l2_len =le16_to_cpu (l2_hdr->len);if (len !=sizeof (*l2_hdr) + l2_len) { bthost_debug(bthost, "L2CAP invalid length: %u != %zu",
@@ -2496,36 +2643,55 @@ static void process_l2cap(struct bthost *bthost, uint16_t handle, } } -static void append_acl_data (struct bthost *bthost,uint16_t handle, -uint8_t flags,const void *data,uint16_t len) +static void append_recv_data (struct bthost *bthost,struct btconn *conn, +const char *type,uint8_t flags, +const void *data,uint16_t len) { -if (!bthost->acl_data) { -bthost_debug (bthost,"Unexpected ACL frame: handle 0x%4.4x " -"flags 0x%2.2x" , handle, flags); +if (!conn->recv_data) { +bthost_debug (bthost,"Unexpected %s frame: handle 0x%4.4x " +"flags 0x%2.2x" , type, conn->handle, flags);return ; } -if (bthost->acl_len + len > bthost->l2_len) { -bthost_debug (bthost,"Unexpected ACL frame: handle 0x%4.4x " -"flags 0x%2.2x" , handle, flags); +if (conn->recv_len + len > conn->data_len) { +bthost_debug (bthost,"Unexpected %s frame: handle 0x%4.4x " +"flags 0x%2.2x" , type, conn->handle, flags);return ; } -memcpy (bthost->acl_data + bthost->acl_len, data, len); - bthost->acl_len += len; +memcpy (conn->recv_data + conn->recv_len, data, len); + conn->recv_len += len; -bthost_debug (bthost,"ACL data: %u/%u bytes" , bthost->acl_len, - bthost->l2_len); +bthost_debug (bthost,"%s data: %u/%u bytes" , type, conn->recv_len, + conn->data_len); +} -if (bthost->acl_len < bthost->l2_len) +static void free_recv_data (struct btconn *conn) +{ +free (conn->recv_data); + conn->recv_data =NULL ; + conn->recv_len =0 ; + conn->data_len =0 ; +} + +static void append_acl_data (struct bthost *bthost,struct btconn *conn, +uint8_t flags,const void *data,uint16_t len) +{ +append_recv_data (bthost, conn,"ACL" , flags, data, len); + +if (conn->recv_len < conn->data_len)return ; -process_l2cap (bthost, handle, bthost->acl_data, bthost->acl_len); +process_l2cap (bthost, conn, conn->recv_data, conn->recv_len); -free (bthost->acl_data); - bthost->acl_data =NULL ; - bthost->acl_len =0 ; - bthost->l2_len =0 ; +free_recv_data (conn); +} + +static void new_recv_data (struct btconn *conn,uint16_t len) +{ + conn->recv_data =malloc (len); + conn->recv_len =0 ; + conn->data_len = len; }static void process_acl (struct bthost *bthost,const void *data,uint16_t len)
@@ -2534,6 +2700,7 @@ static void process_acl(struct bthost *bthost, const void *data, uint16_t len)const struct bt_l2cap_hdr *l2_hdr = (void *) acl_hdr->data;uint16_t handle, acl_len, l2_len;uint8_t flags; +struct btconn *conn; acl_len =le16_to_cpu (acl_hdr->dlen);if (len !=sizeof (*acl_hdr) + acl_len)
@@ -2542,14 +2709,18 @@ static void process_acl(struct bthost *bthost, const void *data, uint16_t len) handle =acl_handle (acl_hdr->handle); flags =acl_flags (acl_hdr->handle); + conn =bthost_find_conn (bthost, handle); +if (!conn) { +bthost_debug (bthost,"Unknown handle: 0x%4.4x" , handle); +return ; + } +switch (flags) {case 0x00 :/* start of a non-automatically-flushable PDU */ case 0x02 :/* start of an automatically-flushable PDU */ -if (bthost->acl_data) { +if (conn->recv_data) {bthost_debug (bthost,"Unexpected ACL start frame" ); -free (bthost->acl_data); - bthost->acl_data =NULL ; - bthost->acl_len =0 ; +free_recv_data (conn); } l2_len =le16_to_cpu (l2_hdr->len) +sizeof (*l2_hdr);
@@ -2557,25 +2728,116 @@ static void process_acl(struct bthost *bthost, const void *data, uint16_t len)bthost_debug (bthost,"acl_len %u l2_len %u" , acl_len, l2_len);if (acl_len == l2_len) { -process_l2cap (bthost, handle, acl_hdr->data, acl_len); +process_l2cap (bthost, conn, acl_hdr->data, acl_len);break ; } - bthost->acl_data =malloc (l2_len); - bthost->acl_len =0 ; - bthost->l2_len = l2_len; +new_recv_data (conn, l2_len);/* fall through */ case 0x01 :/* continuing fragment */ -append_acl_data (bthost, handle, flags, acl_hdr->data, acl_len); +append_acl_data (bthost, conn, flags, acl_hdr->data, acl_len);break ;case 0x03 :/* complete automatically-flushable PDU */ -process_l2cap (bthost, handle, acl_hdr->data, acl_len); +process_l2cap (bthost, conn, acl_hdr->data, acl_len);break ;default :bthost_debug (bthost,"Invalid ACL frame flags 0x%2.2x" , flags); } } +static void process_iso_data (struct bthost *bthost,struct btconn *conn, +const void *data,uint16_t len) +{ +const struct bt_hci_iso_data_start *data_hdr = data; +uint16_t data_len; +struct iso_hook *hook; + + data_len =le16_to_cpu (data_hdr->slen); +if (len !=sizeof (*data_hdr) + data_len) { +bthost_debug (bthost,"ISO invalid length: %u != %zu" , + len,sizeof (*data_hdr) + data_len); +return ; + } + +bthost_debug (bthost,"ISO data: %u bytes (%u)" , data_len, data_hdr->sn); + + hook = conn->iso_hook; +if (!hook) +return ; + + hook->func (data_hdr->data, data_len, hook->user_data); +} + +static void append_iso_data (struct bthost *bthost,struct btconn *conn, +uint8_t flags,const void *data,uint16_t len) +{ +append_recv_data (bthost, conn,"ISO" , flags, data, len); + +if (conn->recv_len < conn->data_len) { +if (flags ==0x03 ) { +bthost_debug (bthost,"Unexpected ISO end frame" ); +free_recv_data (conn); + } +return ; + } + +process_iso_data (bthost, conn, conn->recv_data, conn->recv_len); + +free_recv_data (conn); +} + +static void process_iso (struct bthost *bthost,const void *data,uint16_t len) +{ +const struct bt_hci_iso_hdr *iso_hdr = data; +const struct bt_hci_iso_data_start *data_hdr; +uint16_t handle, iso_len, data_len; +uint8_t flags; +struct btconn *conn; + + iso_len =le16_to_cpu (iso_hdr->dlen); +if (len !=sizeof (*iso_hdr) + iso_len) +return ; + + handle =acl_handle (iso_hdr->handle); + flags =iso_flags_pb (acl_flags (iso_hdr->handle)); + + conn =bthost_find_conn (bthost, handle); +if (!conn) { +bthost_debug (bthost,"Unknown handle: 0x%4.4x" , handle); +return ; + } + + data_hdr = (void *) data +sizeof (*iso_hdr); + +switch (flags) { +case 0x00 : +case 0x02 : +if (conn->recv_data) { +bthost_debug (bthost,"Unexpected ISO start frame" ); +free_recv_data (conn); + } + + data_len =le16_to_cpu (data_hdr->slen) +sizeof (*data_hdr); + +bthost_debug (bthost,"iso_len %u data_len %u" , iso_len, + data_len); + +if (iso_len == data_len) { +process_iso_data (bthost, conn, iso_hdr->data, iso_len); +break ; + } + +new_recv_data (conn, data_len); +/* fall through */ +case 0x01 : +case 0x03 : +append_iso_data (bthost, conn, flags, iso_hdr->data, iso_len); +break ; +default : +bthost_debug (bthost,"Invalid ISO frame flags 0x%2.2x" , flags); + } +} +void bthost_receive_h4 (struct bthost *bthost,const void *data,uint16_t len) {uint8_t pkt_type;
@@ -2598,6 +2860,9 @@ void bthost_receive_h4(struct bthost *bthost, const void *data, uint16_t len)case BT_H4_ACL_PKT :process_acl (bthost, data +1 , len -1 );break ; +case BT_H4_ISO_PKT : +process_iso (bthost, data +1 , len -1 ); +break ;default :bthost_debug (bthost,"Unsupported packet 0x%2.2x" , pkt_type);break ;
@@ -2618,6 +2883,13 @@ void bthost_set_connect_cb(struct bthost *bthost, bthost_new_conn_cb cb, bthost->new_conn_data = user_data; } +void bthost_set_iso_cb (struct bthost *bthost,bthost_new_conn_cb cb, +void *user_data) +{ + bthost->new_iso_cb = cb; + bthost->new_iso_data = user_data; +} +void bthost_hci_connect (struct bthost *bthost,const uint8_t *bdaddr,uint8_t addr_type) {
emulator/bthost.h +11 -0
@@ -47,6 +47,9 @@ typedef void (*bthost_new_conn_cb) (uint16_t handle, void *user_data);void bthost_set_connect_cb (struct bthost *bthost,bthost_new_conn_cb cb,void *user_data); +void bthost_set_iso_cb (struct bthost *bthost,bthost_new_conn_cb cb, +void *user_data); +void bthost_hci_connect (struct bthost *bthost,const uint8_t *bdaddr,uint8_t addr_type);
@@ -62,10 +65,18 @@ typedef void (*bthost_cid_hook_func_t)(const void *data, uint16_t len,void bthost_add_cid_hook (struct bthost *bthost,uint16_t handle,uint16_t cid,bthost_cid_hook_func_t func,void *user_data); +typedef void (*bthost_iso_hook_func_t )(const void *data,uint16_t len, +void *user_data); + +void bthost_add_iso_hook (struct bthost *bthost,uint16_t handle, +bthost_iso_hook_func_t func,void *user_data); +void bthost_send_cid (struct bthost *bthost,uint16_t handle,uint16_t cid,const void *data,uint16_t len);void bthost_send_cid_v (struct bthost *bthost,uint16_t handle,uint16_t cid,const struct iovec *iov,int iovcnt); +void bthost_send_iso (struct bthost *bthost,uint16_t handle, +const struct iovec *iov,int iovcnt);typedef void (*bthost_l2cap_rsp_cb ) (uint8_t code,const void *data,uint16_t len,void *user_data);
emulator/hciemu.c +1 -0
@@ -190,6 +190,7 @@ static gboolean receive_btdev(GIOChannel *channel, GIOCondition condition,case BT_H4_CMD_PKT :case BT_H4_ACL_PKT :case BT_H4_SCO_PKT : +case BT_H4_ISO_PKT :btdev_receive_h4 (btdev, buf, len);break ; }
monitor/bt.h +2 -0
@@ -499,11 +499,13 @@ struct bt_hci_sco_hdr {struct bt_hci_iso_hdr {uint16_t handle;uint16_t dlen; +uint8_t data[]; } __attribute__ ((packed));struct bt_hci_iso_data_start {uint16_t sn;uint16_t slen; +uint8_t data[]; } __attribute__ ((packed));struct bt_hci_evt_hdr {
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 11/12 bthost: Add support for Periodic Advertising
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds bthost_set_pa_params and bthost_set_pa_enable.
--- emulator/bthost.c | 23 +++++++++++++++++++++++ emulator/bthost.h | 2 ++ 2 files changed, 25 insertions(+)
emulator/bthost.c +23 -0
@@ -1006,6 +1006,10 @@ static void evt_cmd_complete(struct bthost *bthost, const void *data,break ;case BT_HCI_CMD_LE_SET_EXT_ADV_ENABLE :break ; +case BT_HCI_CMD_LE_SET_PA_PARAMS : +break ; +case BT_HCI_CMD_LE_SET_PA_ENABLE : +break ;default :bthost_debug (bthost,"Unhandled cmd_complete opcode 0x%04x" , opcode);
@@ -3073,6 +3077,25 @@ void bthost_set_ext_adv_enable(struct bthost *bthost, uint8_t enable)send_command (bthost,BT_HCI_CMD_LE_SET_EXT_ADV_ENABLE , cp,6 ); } +void bthost_set_pa_params (struct bthost *bthost) +{ +struct bt_hci_cmd_le_set_pa_params cp; + +memset (&cp,0 ,sizeof (cp)); + cp.handle =0x01 ; +send_command (bthost,BT_HCI_CMD_LE_SET_PA_PARAMS , &cp,sizeof (cp)); +} + +void bthost_set_pa_enable (struct bthost *bthost,uint8_t enable) +{ +struct bt_hci_cmd_le_set_pa_enable cp; + +memset (&cp,0 ,sizeof (cp)); + cp.enable = enable; + cp.handle =0x01 ; +send_command (bthost,BT_HCI_CMD_LE_SET_PA_ENABLE , &cp,sizeof (cp)); +} +bool bthost_search_ext_adv_addr (struct bthost *bthost,const uint8_t *addr) {const struct queue_entry *entry;
emulator/bthost.h +2 -0
@@ -95,6 +95,8 @@ void bthost_set_ext_adv_data(struct bthost *bthost, const uint8_t *data, uint8_t len);void bthost_set_ext_adv_params (struct bthost *bthost);void bthost_set_ext_adv_enable (struct bthost *bthost,uint8_t enable); +void bthost_set_pa_params (struct bthost *bthost); +void bthost_set_pa_enable (struct bthost *bthost,uint8_t enable);bool bthost_search_ext_adv_addr (struct bthost *bthost,const uint8_t *addr); void bthost_set_scan_params(struct bthost *bthost, uint8_t scan_type,
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 12/12 bthost: Add support for Create BIG
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds bthost_create_big
--- emulator/bthost.c | 13 +++++++++++++ emulator/bthost.h | 1 + 2 files changed, 14 insertions(+)
emulator/bthost.c +13 -0
@@ -3096,6 +3096,19 @@ void bthost_set_pa_enable(struct bthost *bthost, uint8_t enable)send_command (bthost,BT_HCI_CMD_LE_SET_PA_ENABLE , &cp,sizeof (cp)); } +void bthost_create_big (struct bthost *bthost,uint8_t num_bis) +{ +struct bt_hci_cmd_le_create_big cp; + +memset (&cp,0 ,sizeof (cp)); + cp.handle =0x01 ; + cp.adv_handle =0x01 ; + cp.num_bis = num_bis; + cp.bis.sdu =40 ; + cp.bis.phy =0x01 ; +send_command (bthost,BT_HCI_CMD_LE_CREATE_BIG , &cp,sizeof (cp)); +} +bool bthost_search_ext_adv_addr (struct bthost *bthost,const uint8_t *addr) {const struct queue_entry *entry;
emulator/bthost.h +1 -0
@@ -97,6 +97,7 @@ void bthost_set_ext_adv_params(struct bthost *bthost);void bthost_set_ext_adv_enable (struct bthost *bthost,uint8_t enable);void bthost_set_pa_params (struct bthost *bthost);void bthost_set_pa_enable (struct bthost *bthost,uint8_t enable); +void bthost_create_big (struct bthost *bthost,uint8_t num_bis);bool bthost_search_ext_adv_addr (struct bthost *bthost,const uint8_t *addr); void bthost_set_scan_params(struct bthost *bthost, uint8_t scan_type,
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerHi,
Quoted 37 lines · Luiz Augusto von Dentz
From: Luiz Augusto von Dentz <[email protected]>
This implements the necessary commands to be able to emulate a Broadcast Receiver:
BT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNCBT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC_CANCELBT_HCI_CMD_LE_PERIODIC_ADV_TERM_SYNCBT_HCI_EVT_LE_PER_SYNC_ESTABLISHEDBT_HCI_CMD_LE_BIG_CREATE_SYNCBT_HCI_CMD_LE_BIG_TERM_SYNCv2: Adds support for
BT_H4_ISO_PKTto bthost.Luiz Augusto von Dentz (12):
monitor: Fix Create BIG PDU
btdev: ImplementBT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC
btdev: ImplementBT_HCI_CMD_LE_PERIODIC_ADV_CREATE_SYNC_CANCEL
btdev: ImplementBT_HCI_CMD_LE_PERIODIC_ADV_TERM_SYNC
btdev: SendBT_HCI_EVT_LE_PER_SYNC_ESTABLISHEDwhen scan is initiated
btdev: SendBT_HCI_EVT_LE_PER_SYNC_ESTABLISHEDif remote start pa
monitor: Rename Periodic Advertising terms to PA/pa
btdev: ImplementsBT_HCI_CMD_LE_BIG_CREATE_SYNC
btdev: ImplementsBT_HCI_CMD_LE_BIG_TERM_SYNC
bthost: Add support forBT_H4_ISO_PKT
bthost: Add support for Periodic Advertising
bthost: Add support for Create BIGemulator/btdev.c | 455 +++++++++++++++++++++++++++++++++++++++------- emulator/bthost.c | 392 ++++++++++++++++++++++++++++++++++----- emulator/bthost.h | 14 ++ emulator/hciemu.c | 1 + monitor/bt.h | 93 +++++----- monitor/packet.c | 113 ++++++------ 6 files changed, 862 insertions(+), 206 deletions(-)
Quoted 3 lines
--
2.35.1
Pushed.
Signature · 1 line
Luiz Augusto von Dentz