Introducing NAME_REQUEST_FAILED flag that will be sent together with device found event on name resolve failure. This will provide the userspace with an information so it can decide not to resolve the name for these devices in the future.
Unified · Split
| @@ -936,10 +936,11 @@ struct mgmt_ev_auth_failed { · 935 unmodified lines | |||
| 936 | __u8 status; | 936 | __u8 status; |
| 937 | } __packed; | 937 | } __packed; |
| 938 | 938 | ||
| 939 | #define MGMT_DEV_FOUND_CONFIRM_NAME 0x01 | 939 | #define MGMT_DEV_FOUND_CONFIRM_NAME 0x01 |
| 940 | #define MGMT_DEV_FOUND_LEGACY_PAIRING 0x02 | 940 | #define MGMT_DEV_FOUND_LEGACY_PAIRING 0x02 |
| 941 | #define MGMT_DEV_FOUND_NOT_CONNECTABLE 0x04 | 941 | #define MGMT_DEV_FOUND_NOT_CONNECTABLE 0x04 |
| 942 | #define MGMT_DEV_FOUND_INITIATED_CONN 0x08 | 942 | #define MGMT_DEV_FOUND_INITIATED_CONN 0x08 |
| 943 | #define MGMT_DEV_FOUND_NAME_REQUEST_FAILED 0x10 | ||
| 943 | 944 | ||
| 944 | #define MGMT_EV_DEVICE_FOUND 0x0012 | 945 | #define MGMT_EV_DEVICE_FOUND 0x0012 |
| 945 | struct mgmt_ev_device_found { | 946 | struct mgmt_ev_device_found { |
| @@ -2175,13 +2175,10 @@ static void hci_check_pending_name(struct hci_dev *hdev, struct hci_conn *conn, · 2174 unmodified lines | |||
| 2175 | return; | 2175 | return; |
| 2176 | 2176 | ||
| 2177 | list_del(&e->list); | 2177 | list_del(&e->list); |
| 2178 | if (name) { | 2178 | |
| 2179 | e->name_state = NAME_KNOWN; | 2179 | e->name_state = name ? NAME_KNOWN : NAME_NOT_KNOWN; |
| 2180 | mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00, | 2180 | mgmt_remote_name(hdev, bdaddr, ACL_LINK, 0x00, e->data.rssi, |
| 2181 | e->data.rssi, name, name_len); | 2181 | name, name_len); |
| 2182 | } else { | ||
| 2183 | e->name_state = NAME_NOT_KNOWN; | ||
| 2184 | } | ||
| 2185 | 2182 | ||
| 2186 | if (hci_resolve_next_name(hdev)) | 2183 | if (hci_resolve_next_name(hdev)) |
| 2187 | return; | 2184 | return; |
| @@ -9615,6 +9615,7 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, · 9614 unmodified lines | |||
| 9615 | struct mgmt_ev_device_found *ev; | 9615 | struct mgmt_ev_device_found *ev; |
| 9616 | char buf[sizeof(*ev) + HCI_MAX_NAME_LENGTH + 2]; | 9616 | char buf[sizeof(*ev) + HCI_MAX_NAME_LENGTH + 2]; |
| 9617 | u16 eir_len; | 9617 | u16 eir_len; |
| 9618 | u32 flags; | ||
| 9618 | 9619 | ||
| 9619 | ev = (struct mgmt_ev_device_found *) buf; | 9620 | ev = (struct mgmt_ev_device_found *) buf; |
| 9620 | 9621 | ||
| @@ -9624,10 +9625,17 @@ void mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type, · 3 unmodified lines | |||
| 9624 | ev->addr.type = link_to_bdaddr(link_type, addr_type); | 9625 | ev->addr.type = link_to_bdaddr(link_type, addr_type); |
| 9625 | ev->rssi = rssi; | 9626 | ev->rssi = rssi; |
| 9626 | 9627 | ||
| 9627 | eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE, name, | 9628 | if (name) { |
| 9628 | name_len); | 9629 | eir_len = eir_append_data(ev->eir, 0, EIR_NAME_COMPLETE, name, |
| 9630 | name_len); | ||
| 9631 | flags = 0; | ||
| 9632 | } else { | ||
| 9633 | eir_len = 0; | ||
| 9634 | flags = MGMT_DEV_FOUND_NAME_REQUEST_FAILED; | ||
| 9635 | } | ||
| 9629 | 9636 | ||
| 9630 | ev->eir_len = cpu_to_le16(eir_len); | 9637 | ev->eir_len = cpu_to_le16(eir_len); |
| 9638 | ev->flags = cpu_to_le32(flags); | ||
| 9631 | 9639 | ||
| 9632 | mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, sizeof(*ev) + eir_len, NULL); | 9640 | mgmt_event(MGMT_EV_DEVICE_FOUND, hdev, ev, sizeof(*ev) + eir_len, NULL); |
| 9633 | } | 9641 | } |