diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2006-09-20 16:25:08 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2006-09-20 16:25:08 +0000 |
| commit | 7da9e342a0583c92f30f3031ceb1fb3236c942d0 (patch) | |
| tree | 3944e7338270103a75d00b72b36a7c383800312c | |
| parent | abe03b24985eef4659c9d058c354f9b7df0a41f0 (diff) | |
Take care of extended inquiry response data
| -rw-r--r-- | hcid/dbus.c | 2 | ||||
| -rw-r--r-- | hcid/hcid.h | 2 | ||||
| -rw-r--r-- | hcid/security.c | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/hcid/dbus.c b/hcid/dbus.c index 8b7bec84..79662880 100644 --- a/hcid/dbus.c +++ b/hcid/dbus.c @@ -1140,7 +1140,7 @@ void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status) done: bt_free(local_addr); } -void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, int8_t rssi) +void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, int8_t rssi, uint8_t *data) { char filename[PATH_MAX + 1]; DBusMessage *signal_device; diff --git a/hcid/hcid.h b/hcid/hcid.h index 271677f6..4b8b464b 100644 --- a/hcid/hcid.h +++ b/hcid/hcid.h @@ -155,7 +155,7 @@ void hcid_dbus_inquiry_start(bdaddr_t *local); void hcid_dbus_inquiry_complete(bdaddr_t *local); void hcid_dbus_periodic_inquiry_start(bdaddr_t *local, uint8_t status); void hcid_dbus_periodic_inquiry_exit(bdaddr_t *local, uint8_t status); -void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, int8_t rssi); +void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, int8_t rssi, uint8_t *data); void hcid_dbus_remote_class(bdaddr_t *local, bdaddr_t *peer, uint32_t class); void hcid_dbus_remote_name(bdaddr_t *local, bdaddr_t *peer, uint8_t status, char *name); void hcid_dbus_conn_complete(bdaddr_t *local, uint8_t status, uint16_t handle, bdaddr_t *peer); diff --git a/hcid/security.c b/hcid/security.c index 55d38dff..77fb9d41 100644 --- a/hcid/security.c +++ b/hcid/security.c @@ -509,7 +509,7 @@ static inline void inquiry_result(int dev, bdaddr_t *sba, int plen, void *ptr) | (info->dev_class[1] << 8) | (info->dev_class[2] << 16); - hcid_dbus_inquiry_result(sba, &info->bdaddr, class, 0); + hcid_dbus_inquiry_result(sba, &info->bdaddr, class, 0, NULL); update_lastseen(sba, &info->bdaddr); @@ -533,7 +533,7 @@ static inline void inquiry_result_with_rssi(int dev, bdaddr_t *sba, int plen, vo | (info->dev_class[2] << 16); hcid_dbus_inquiry_result(sba, &info->bdaddr, - class, info->rssi); + class, info->rssi, NULL); update_lastseen(sba, &info->bdaddr); @@ -547,7 +547,7 @@ static inline void inquiry_result_with_rssi(int dev, bdaddr_t *sba, int plen, vo | (info->dev_class[2] << 16); hcid_dbus_inquiry_result(sba, &info->bdaddr, - class, info->rssi); + class, info->rssi, NULL); update_lastseen(sba, &info->bdaddr); @@ -567,7 +567,8 @@ static inline void extended_inquiry_result(int dev, bdaddr_t *sba, int plen, voi | (info->dev_class[1] << 8) | (info->dev_class[2] << 16); - hcid_dbus_inquiry_result(sba, &info->bdaddr, class, info->rssi); + hcid_dbus_inquiry_result(sba, &info->bdaddr, class, + info->rssi, info->data); update_lastseen(sba, &info->bdaddr); |