diff options
| author | Mariusz Skamra <mariusz.skamra@tieto.com> | 2015-09-23 13:36:54 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2015-10-05 10:56:13 +0300 |
| commit | ee014e7fff1185c33da2b1346f45912c03692c2e (patch) | |
| tree | d6580115406370c93badc40ef4dcc4acf08ea574 | |
| parent | c88a735318a65d0d29dc46269044d9f2bd0ba6a9 (diff) | |
| download | bluez-ee014e7fff1185c33da2b1346f45912c03692c2e.tar.gz | |
emulator: Fix LE Connection Complete Event data
This sets LE Connection Complete Event paramaters based on parameters
from LE Create Connection command.
Event parameters like Conn_Interval and Supervision_Timeout
shouldn't be set to 0.
| -rw-r--r-- | emulator/btdev.c | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/emulator/btdev.c b/emulator/btdev.c index ceefd56ed..f3ef1ca62 100644 --- a/emulator/btdev.c +++ b/emulator/btdev.c @@ -1095,8 +1095,8 @@ static void sco_conn_complete(struct btdev *btdev, uint8_t status) } static void le_conn_complete(struct btdev *btdev, - const uint8_t *bdaddr, uint8_t bdaddr_type, - uint8_t status) + const struct bt_hci_cmd_le_create_conn *lecc, + uint8_t status) { char buf[1 + sizeof(struct bt_hci_evt_le_conn_complete)]; struct bt_hci_evt_le_conn_complete *cc = (void *) &buf[1]; @@ -1106,8 +1106,10 @@ static void le_conn_complete(struct btdev *btdev, buf[0] = BT_HCI_EVT_LE_CONN_COMPLETE; if (!status) { - struct btdev *remote = find_btdev_by_bdaddr_type(bdaddr, - bdaddr_type); + struct btdev *remote; + + remote = find_btdev_by_bdaddr_type(lecc->peer_addr, + lecc->peer_addr_type); btdev->conn = remote; btdev->le_adv_enable = 0; @@ -1123,6 +1125,9 @@ static void le_conn_complete(struct btdev *btdev, cc->role = 0x01; cc->handle = cpu_to_le16(42); + cc->interval = lecc->max_interval; + cc->latency = lecc->latency; + cc->supv_timeout = lecc->supv_timeout; send_event(remote, BT_HCI_EVT_LE_META_EVENT, buf, sizeof(buf)); @@ -1130,8 +1135,8 @@ static void le_conn_complete(struct btdev *btdev, } cc->status = status; - cc->peer_addr_type = bdaddr_type; - memcpy(cc->peer_addr, bdaddr, 6); + cc->peer_addr_type = lecc->peer_addr_type; + memcpy(cc->peer_addr, lecc->peer_addr, 6); cc->role = 0x00; send_event(btdev, BT_HCI_EVT_LE_META_EVENT, buf, sizeof(buf)); @@ -1173,16 +1178,17 @@ static bool adv_connectable(struct btdev *btdev) return btdev->le_adv_type != 0x03; } -static void le_conn_request(struct btdev *btdev, const uint8_t *bdaddr, - uint8_t bdaddr_type) +static void le_conn_request(struct btdev *btdev, + const struct bt_hci_cmd_le_create_conn *lecc) { - struct btdev *remote = find_btdev_by_bdaddr_type(bdaddr, bdaddr_type); + struct btdev *remote = find_btdev_by_bdaddr_type(lecc->peer_addr, + lecc->peer_addr_type); if (remote && adv_connectable(remote) && adv_match(btdev, remote) && - remote->le_adv_own_addr == bdaddr_type) - le_conn_complete(btdev, bdaddr, bdaddr_type, 0); + remote->le_adv_own_addr == lecc->peer_addr_type) + le_conn_complete(btdev, lecc, 0); else - le_conn_complete(btdev, bdaddr, bdaddr_type, + le_conn_complete(btdev, lecc, BT_HCI_ERR_CONN_FAILED_TO_ESTABLISH); } @@ -3323,7 +3329,7 @@ static void default_cmd_completion(struct btdev *btdev, uint16_t opcode, return; lecc = data; btdev->le_scan_own_addr_type = lecc->own_addr_type; - le_conn_request(btdev, lecc->peer_addr, lecc->peer_addr_type); + le_conn_request(btdev, lecc); break; case BT_HCI_CMD_LE_CONN_UPDATE: |