diff options
| -rw-r--r-- | hcid/dbus-hci.c | 45 | ||||
| -rw-r--r-- | hcid/dbus-hci.h | 1 | ||||
| -rw-r--r-- | hcid/device.c | 141 | ||||
| -rw-r--r-- | hcid/hcid.h | 1 | ||||
| -rw-r--r-- | hcid/security.c | 16 |
5 files changed, 160 insertions, 44 deletions
diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c index fa84053f..5df7012d 100644 --- a/hcid/dbus-hci.c +++ b/hcid/dbus-hci.c @@ -1841,7 +1841,7 @@ void hcid_dbus_write_class_complete(bdaddr_t *local) { struct adapter *adapter; char path[MAX_PATH_LENGTH], local_addr[18]; - int id, dd = -1; + int id, dd; uint8_t cls[3]; ba2str(local, local_addr); @@ -1861,21 +1861,52 @@ void hcid_dbus_write_class_complete(bdaddr_t *local) dd = hci_open_dev(id); if (dd < 0) { error("HCI device open failed: hci%d", id); - goto failed; + return; } if (hci_read_class_of_dev(dd, cls, 1000) < 0) { - error("Can't read class of device on hci%d: %s(%d)", - id, strerror(errno), errno); - goto failed; + error("Can't read class of device on hci%d: %s (%d)", + id, strerror(errno), errno); + hci_close_dev(dd); + return; } write_local_class(local, cls); memcpy(adapter->class, cls, 3); -failed: - if (dd >= 0) + hci_close_dev(dd); +} + +void hcid_dbus_write_simple_pairing_mode_complete(bdaddr_t *local) +{ + char addr[18]; + int dev_id, dd; + uint8_t mode; + + ba2str(local, addr); + + dev_id = hci_devid(addr); + if (dev_id < 0) { + error("No matching device id for %s", addr); + return; + } + + dd = hci_open_dev(dev_id); + if (dd < 0) { + error("HCI device open failed: hci%d", dev_id); + return; + } + + if (hci_read_simple_pairing_mode(dd, &mode, 1000) < 0) { + error("Can't read class of device on hci%d: %s(%d)", + dev_id, strerror(errno), errno); hci_close_dev(dd); + return; + } + + set_simple_pairing_mode(dev_id, mode); + + hci_close_dev(dd); } void hcid_dbus_pin_code_reply(bdaddr_t *local, void *ptr) diff --git a/hcid/dbus-hci.h b/hcid/dbus-hci.h index a98e38d8..c7b3e1b4 100644 --- a/hcid/dbus-hci.h +++ b/hcid/dbus-hci.h @@ -50,6 +50,7 @@ void hcid_dbus_bonding_process_complete(bdaddr_t *local, bdaddr_t *peer, uint8_t void hcid_dbus_setname_complete(bdaddr_t *local); void hcid_dbus_setscan_enable_complete(bdaddr_t *local); void hcid_dbus_write_class_complete(bdaddr_t *local); +void hcid_dbus_write_simple_pairing_mode_complete(bdaddr_t *local); void hcid_dbus_pin_code_reply(bdaddr_t *local, void *ptr); int unregister_adapter_path(const char *path); diff --git a/hcid/device.c b/hcid/device.c index 1df19667..b3c9b050 100644 --- a/hcid/device.c +++ b/hcid/device.c @@ -80,6 +80,7 @@ struct hci_dev { uint16_t hci_rev; uint16_t manufacturer; + uint8_t ssp_mode; uint8_t name[248]; uint8_t class[3]; @@ -106,14 +107,14 @@ static int device_read_bdaddr(uint16_t dev_id, bdaddr_t *bdaddr) dd = hci_open_dev(dev_id); if (dd < 0) { error("Can't open device hci%d", - dev_id, strerror(errno), errno); + dev_id, strerror(errno), errno); return -errno; } if (hci_read_bd_addr(dd, bdaddr, 2000) < 0) { int err = errno; error("Can't read address for hci%d: %s (%d)", - dev_id, strerror(errno), errno); + dev_id, strerror(errno), errno); hci_close_dev(dd); return -err; } @@ -145,9 +146,9 @@ int add_device(uint16_t dev_id) if (bacmp(&di.bdaddr, BDADDR_ANY)) bacpy(&dev->bdaddr, &di.bdaddr); else { - int ret = device_read_bdaddr(dev_id, &dev->bdaddr); - if (ret < 0) - return ret; + int err = device_read_bdaddr(dev_id, &dev->bdaddr); + if (err < 0) + return err; } memcpy(dev->features, di.features, 8); @@ -199,12 +200,40 @@ static inline uint8_t get_inquiry_mode(struct hci_dev *dev) return 0; } +static void update_ext_inquiry_response(int dd, struct hci_dev *dev) +{ + uint8_t fec = 0, data[240]; + + if (!(dev->features[6] & LMP_EXT_INQ)) + return; + + memset(data, 0, sizeof(data)); + + if (dev->ssp_mode > 0) { + int len; + + len = strlen((char *) dev->name); + if (len > 48) { + len = 48; + data[1] = 0x08; + } else + data[1] = 0x09; + data[0] = len + 1; + memcpy(data + 2, dev->name, len); + } + + if (hci_write_ext_inquiry_response(dd, fec, data, 2000) < 0) + error("Can't write extended inquiry response: %s (%d)", + strerror(errno), errno); +} + int start_device(uint16_t dev_id) { struct hci_dev *dev; struct hci_version ver; uint8_t features[8], inqmode; uint8_t events[8] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00 }; + char name[249]; int dd, err; ASSERT_DEV_ID; @@ -246,24 +275,34 @@ int start_device(uint16_t dev_id) if (hci_read_class_of_dev(dd, dev->class, 1000) < 0) { err = errno; - error("Can't read class of device on hci%d: %s(%d)", - dev_id, strerror(err), err); + error("Can't read class of device on hci%d: %s (%d)", + dev_id, strerror(err), err); hci_close_dev(dd); return -err; } - inqmode = get_inquiry_mode(dev); - if (inqmode < 1) - goto done; + if (hci_read_local_name(dd, sizeof(name), name, 2000) < 0) { + err = errno; + error("Can't read local name on hci%d: %s (%d)", + dev_id, strerror(err), err); + hci_close_dev(dd); + return -err; + } - if (hci_write_inquiry_mode(dd, inqmode, 1000) < 0) { - int err = errno; - error("Can't write inquiry mode for hci%d: %s (%d)", - dev_id, strerror(errno), errno); + memcpy(dev->name, name, 248); + + if (!(features[6] & LMP_SIMPLE_PAIR)) + goto setup; + + if (hci_read_simple_pairing_mode(dd, &dev->ssp_mode, 1000) < 0) { + err = errno; + error("Can't read simple pairing mode on hci%d: %s (%d)", + dev_id, strerror(err), err); hci_close_dev(dd); return -err; } +setup: if (ver.hci_rev > 1) { if (features[5] & LMP_SNIFF_SUBR) events[5] |= 0x20; @@ -280,10 +319,36 @@ int start_device(uint16_t dev_id) if (features[7] & LMP_LSTO) events[6] |= 0x80; + if (features[6] & LMP_SIMPLE_PAIR) { + events[6] |= 0x01; /* IO Capability Request */ + events[6] |= 0x02; /* IO Capability Response */ + events[6] |= 0x04; /* User Confirmation Request */ + events[6] |= 0x08; /* User Passkey Request */ + events[6] |= 0x10; /* Remote OOB Data Request */ + events[6] |= 0x20; /* Simple Pairing Complete */ + events[7] |= 0x04; /* User Passkey Notification */ + events[7] |= 0x08; /* Keypress Notification */ + events[7] |= 0x10; /* Remote Host Supported Features Notification */ + } + hci_send_cmd(dd, OGF_HOST_CTL, OCF_SET_EVENT_MASK, sizeof(events), events); } + update_ext_inquiry_response(dd, dev); + + inqmode = get_inquiry_mode(dev); + if (inqmode < 1) + goto done; + + if (hci_write_inquiry_mode(dd, inqmode, 1000) < 0) { + int err = errno; + error("Can't write inquiry mode for hci%d: %s (%d)", + dev_id, strerror(errno), err); + hci_close_dev(dd); + return -err; + } + done: hci_close_dev(dd); @@ -450,6 +515,31 @@ int get_device_company(uint16_t dev_id, char *company, size_t size) return err; } +int set_simple_pairing_mode(uint16_t dev_id, uint8_t mode) +{ + struct hci_dev *dev; + int dd; + + ASSERT_DEV_ID; + + dev = &devices[dev_id]; + + dev->ssp_mode = mode; + + dd = hci_open_dev(dev_id); + if (dd < 0) { + error("Can't open device hci%d", + dev_id, strerror(errno), errno); + return -errno; + } + + update_ext_inquiry_response(dd, dev); + + hci_close_dev(dd); + + return 0; +} + int get_device_name(uint16_t dev_id, char *name, size_t size) { char tmp[249]; @@ -505,28 +595,9 @@ int set_device_name(uint16_t dev_id, const char *name) return -err; } - if (dev->features[6] & LMP_EXT_INQ) { - uint8_t fec = 0, data[240]; - int len; + memcpy(dev->name, name, 248); - memset(data, 0, sizeof(data)); - len = strlen(name); - if (len > 48) { - len = 48; - data[1] = 0x08; - } else - data[1] = 0x09; - data[0] = len + 1; - memcpy(data + 2, name, len); - - if (hci_write_ext_inquiry_response(dd, fec, data, 2000) < 0) { - int err = errno; - error("Can't write extended inquiry response for hci%d: %s (%d)", - dev_id, strerror(errno), errno); - hci_close_dev(dd); - return -err; - } - } + update_ext_inquiry_response(dd, dev); hci_close_dev(dd); diff --git a/hcid/hcid.h b/hcid/hcid.h index 4d49b957..4e628f73 100644 --- a/hcid/hcid.h +++ b/hcid/hcid.h @@ -168,6 +168,7 @@ int get_device_revision(uint16_t dev_id, char *revision, size_t size); int get_device_manufacturer(uint16_t dev_id, char *manufacturer, size_t size); int get_device_company(uint16_t dev_id, char *company, size_t size); +int set_simple_pairing_mode(uint16_t dev_id, uint8_t mode); int get_device_name(uint16_t dev_id, char *name, size_t size); int set_device_name(uint16_t dev_id, const char *name); int get_device_alias(uint16_t dev_id, const bdaddr_t *bdaddr, char *alias, size_t size); diff --git a/hcid/security.c b/hcid/security.c index 8fd538a0..2716fb7a 100644 --- a/hcid/security.c +++ b/hcid/security.c @@ -439,6 +439,9 @@ static inline void cmd_complete(int dev, bdaddr_t *sba, void *ptr) case cmd_opcode_pack(OGF_HOST_CTL, OCF_WRITE_CLASS_OF_DEV): hcid_dbus_write_class_complete(sba); break; + case cmd_opcode_pack(OGF_HOST_CTL, OCF_WRITE_SIMPLE_PAIRING_MODE): + hcid_dbus_write_simple_pairing_mode_complete(sba); + break; case cmd_opcode_pack(OGF_LINK_CTL, OCF_PIN_CODE_REPLY): case cmd_opcode_pack(OGF_LINK_CTL, OCF_PIN_CODE_NEG_REPLY): hcid_dbus_pin_code_reply(sba, ptr); @@ -805,17 +808,26 @@ void start_security_manager(int hdev) hci_filter_set_event(EVT_LINK_KEY_REQ, &flt); hci_filter_set_event(EVT_LINK_KEY_NOTIFY, &flt); hci_filter_set_event(EVT_RETURN_LINK_KEYS, &flt); + hci_filter_set_event(EVT_IO_CAPABILITY_REQUEST, &flt); + hci_filter_set_event(EVT_IO_CAPABILITY_RESPONSE, &flt); + hci_filter_set_event(EVT_USER_CONFIRM_REQUEST, &flt); + hci_filter_set_event(EVT_USER_PASSKEY_REQUEST, &flt); + hci_filter_set_event(EVT_REMOTE_OOB_DATA_REQUEST, &flt); + hci_filter_set_event(EVT_USER_PASSKEY_NOTIFY, &flt); + hci_filter_set_event(EVT_KEYPRESS_NOTIFY, &flt); + hci_filter_set_event(EVT_SIMPLE_PAIRING_COMPLETE, &flt); + hci_filter_set_event(EVT_AUTH_COMPLETE, &flt); hci_filter_set_event(EVT_REMOTE_NAME_REQ_COMPLETE, &flt); hci_filter_set_event(EVT_READ_REMOTE_VERSION_COMPLETE, &flt); hci_filter_set_event(EVT_READ_REMOTE_FEATURES_COMPLETE, &flt); + hci_filter_set_event(EVT_REMOTE_HOST_FEATURES_NOTIFY, &flt); hci_filter_set_event(EVT_INQUIRY_COMPLETE, &flt); hci_filter_set_event(EVT_INQUIRY_RESULT, &flt); hci_filter_set_event(EVT_INQUIRY_RESULT_WITH_RSSI, &flt); hci_filter_set_event(EVT_EXTENDED_INQUIRY_RESULT, &flt); + hci_filter_set_event(EVT_CONN_REQUEST, &flt); hci_filter_set_event(EVT_CONN_COMPLETE, &flt); hci_filter_set_event(EVT_DISCONN_COMPLETE, &flt); - hci_filter_set_event(EVT_AUTH_COMPLETE, &flt); - hci_filter_set_event(EVT_CONN_REQUEST, &flt); if (setsockopt(dev, SOL_HCI, HCI_FILTER, &flt, sizeof(flt)) < 0) { error("Can't set filter on hci%d: %s (%d)", hdev, strerror(errno), errno); |