diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-04-15 14:09:53 +0000 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-04-15 14:09:53 +0000 |
| commit | a437235f74a3b924245bb61254d49f30e9d93363 (patch) | |
| tree | 582c84385a8ea4724f798c4773824249677a3b94 | |
| parent | 004de00e5a159c3b11984e9ebda8c3f13d1b5154 (diff) | |
Fix endiannes handling of connection handles
| -rw-r--r-- | hcid/adapter.c | 2 | ||||
| -rw-r--r-- | hcid/dbus-hci.c | 2 | ||||
| -rw-r--r-- | hcid/security.c | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/hcid/adapter.c b/hcid/adapter.c index 47dbed1d..3f8be357 100644 --- a/hcid/adapter.c +++ b/hcid/adapter.c @@ -2176,7 +2176,7 @@ gboolean dc_pending_timeout_handler(void *data) } /* Send the HCI disconnect command */ - if (hci_disconnect(dd, pending_dc->conn_handle, + if (hci_disconnect(dd, htobs(pending_dc->conn_handle), HCI_OE_USER_ENDED_CONNECTION, 500) < 0) { int err = errno; diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c index 360a0bae..2d21c905 100644 --- a/hcid/dbus-hci.c +++ b/hcid/dbus-hci.c @@ -1998,7 +1998,7 @@ void hcid_dbus_disconn_complete(bdaddr_t *local, uint8_t status, } l = g_slist_find_custom(adapter->active_conn, &handle, - active_conn_find_by_handle); + active_conn_find_by_handle); if (!l) return; diff --git a/hcid/security.c b/hcid/security.c index f3dedd90..62a79509 100644 --- a/hcid/security.c +++ b/hcid/security.c @@ -672,7 +672,8 @@ static inline void conn_complete(int dev, int dev_id, bdaddr_t *sba, void *ptr) if (evt->link_type != ACL_LINK) return; - hcid_dbus_conn_complete(sba, evt->status, evt->handle, &evt->bdaddr); + hcid_dbus_conn_complete(sba, evt->status, btohs(evt->handle), + &evt->bdaddr); if (evt->status) return; @@ -715,7 +716,8 @@ static inline void disconn_complete(int dev, bdaddr_t *sba, void *ptr) { evt_disconn_complete *evt = ptr; - hcid_dbus_disconn_complete(sba, evt->status, evt->handle, evt->reason); + hcid_dbus_disconn_complete(sba, evt->status, btohs(evt->handle), + evt->reason); } static inline void auth_complete(int dev, bdaddr_t *sba, void *ptr) @@ -723,7 +725,7 @@ static inline void auth_complete(int dev, bdaddr_t *sba, void *ptr) evt_auth_complete *evt = ptr; bdaddr_t dba; - if (get_bdaddr(dev, sba, btohs(evt->handle), &dba) < 0) + if (get_bdaddr(dev, sba, btohs(evt->handle), &dba) < 0) return; if (evt->status) |