From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
This handles recently introduced Scan Response flag since that
shouldn't affect connectable flag the device would be considered
connectable but it shall not create a new device by itself.
---
lib/mgmt.h | 1 +
src/adapter.c | 44 +++++++++++++++++++++++++-------------------
src/adapter.h | 8 +++-----
src/adv_monitor.c | 17 +++--------------
4 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/lib/mgmt.h b/lib/mgmt.h
index c3c9052320bb..062fa027127c 100644
--- a/lib/mgmt.h
+++ b/lib/mgmt.h
@@ -902,6 +902,7 @@ struct mgmt_ev_auth_failed {
#define MGMT_DEV_FOUND_NOT_CONNECTABLE BIT(2)
#define MGMT_DEV_FOUND_INITIATED_CONN BIT(3)
#define MGMT_DEV_FOUND_NAME_REQUEST_FAILED BIT(4)
+#define MGMT_DEV_FOUND_SCAN_RSP BIT(5)
#define MGMT_EV_DEVICE_FOUND 0x0012
struct mgmt_ev_device_found {
diff --git a/src/adapter.c b/src/adapter.c
index 74ed52468b81..2679d4302307 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -7088,12 +7088,10 @@ static bool device_is_discoverable(struct btd_adapter *adapter,
return discoverable;
}
-void btd_adapter_update_found_device(struct btd_adapter *adapter,
+void btd_adapter_device_found(struct btd_adapter *adapter,
const bdaddr_t *bdaddr,
uint8_t bdaddr_type, int8_t rssi,
- bool confirm, bool legacy,
- bool not_connectable,
- bool name_resolve_failed,
+ uint32_t flags,
const uint8_t *data, uint8_t data_len,
bool monitoring)
{
@@ -7102,9 +7100,20 @@ void btd_adapter_update_found_device(struct btd_adapter *adapter,
struct eir_data eir_data;
bool name_known, discoverable;
char addr[18];
+ bool confirm;
+ bool legacy;
+ bool not_connectable;
+ bool name_resolve_failed;
+ bool scan_rsp;
bool duplicate = false;
struct queue *matched_monitors = NULL;
+ confirm = (flags & MGMT_DEV_FOUND_CONFIRM_NAME);
+ legacy = (flags & MGMT_DEV_FOUND_LEGACY_PAIRING);
+ not_connectable = (flags & MGMT_DEV_FOUND_NOT_CONNECTABLE);
+ name_resolve_failed = (flags & MGMT_DEV_FOUND_NAME_REQUEST_FAILED);
+ scan_rsp = (flags & MGMT_DEV_FOUND_SCAN_RSP);
+
if (!btd_adv_monitor_offload_enabled(adapter->adv_monitor_manager) ||
(MGMT_VERSION(mgmt_version, mgmt_revision) <
MGMT_VERSION(1, 22))) {
@@ -7137,6 +7146,14 @@ void btd_adapter_update_found_device(struct btd_adapter *adapter,
dev = btd_adapter_find_device(adapter, bdaddr, bdaddr_type);
if (!dev) {
+ /* In case of being just a scan response don't attempt to create
+ * the device.
+ */
+ if (scan_rsp) {
+ eir_data_free(&eir_data);
+ return;
+ }
+
if (!discoverable && !monitoring && !eir_data.rsi) {
eir_data_free(&eir_data);
return;
@@ -7317,10 +7334,6 @@ static void device_found_callback(uint16_t index, uint16_t length,
const uint8_t *eir;
uint16_t eir_len;
uint32_t flags;
- bool confirm_name;
- bool legacy;
- bool not_connectable;
- bool name_resolve_failed;
char addr[18];
if (length < sizeof(*ev)) {
@@ -7342,22 +7355,15 @@ static void device_found_callback(uint16_t index, uint16_t length,
else
eir = ev->eir;
- flags = btohl(ev->flags);
+ flags = le32_to_cpu(ev->flags);
ba2str(&ev->addr.bdaddr, addr);
DBG("hci%u addr %s, rssi %d flags 0x%04x eir_len %u",
index, addr, ev->rssi, flags, eir_len);
- confirm_name = (flags & MGMT_DEV_FOUND_CONFIRM_NAME);
- legacy = (flags & MGMT_DEV_FOUND_LEGACY_PAIRING);
- not_connectable = (flags & MGMT_DEV_FOUND_NOT_CONNECTABLE);
- name_resolve_failed = (flags & MGMT_DEV_FOUND_NAME_REQUEST_FAILED);
-
- btd_adapter_update_found_device(adapter, &ev->addr.bdaddr,
- ev->addr.type, ev->rssi, confirm_name,
- legacy, not_connectable,
- name_resolve_failed, eir, eir_len,
- false);
+ btd_adapter_device_found(adapter, &ev->addr.bdaddr,
+ ev->addr.type, ev->rssi, flags,
+ eir, eir_len, false);
}
struct agent *adapter_get_agent(struct btd_adapter *adapter)
diff --git a/src/adapter.h b/src/adapter.h
index 32e49a933b13..ca96c1f6575f 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -88,14 +88,12 @@ struct btd_device *btd_adapter_find_device_by_path(struct btd_adapter *adapter,
const char *path);
struct btd_device *btd_adapter_find_device_by_fd(int fd);
-void btd_adapter_update_found_device(struct btd_adapter *adapter,
+void btd_adapter_device_found(struct btd_adapter *adapter,
const bdaddr_t *bdaddr,
uint8_t bdaddr_type, int8_t rssi,
- bool confirm, bool legacy,
- bool not_connectable,
- bool name_resolve_failed,
+ uint32_t flags,
const uint8_t *data, uint8_t data_len,
- bool monitored);
+ bool monitoring);
const char *adapter_get_path(struct btd_adapter *adapter);
const bdaddr_t *btd_adapter_get_address(struct btd_adapter *adapter);
diff --git a/src/adv_monitor.c b/src/adv_monitor.c
index 33f4d9619c1c..cb38916fc28b 100644
--- a/src/adv_monitor.c
+++ b/src/adv_monitor.c
@@ -1583,10 +1583,6 @@ static void adv_monitor_device_found_callback(uint16_t index, uint16_t length,
const uint8_t *ad_data = NULL;
uint16_t ad_data_len;
uint32_t flags;
- bool confirm_name;
- bool legacy;
- bool not_connectable;
- bool name_resolve_failed;
char addr[18];
if (length < sizeof(*ev)) {
@@ -1605,21 +1601,14 @@ static void adv_monitor_device_found_callback(uint16_t index, uint16_t length,
if (ad_data_len > 0)
ad_data = ev->ad_data;
- flags = btohl(ev->flags);
+ flags = le32_to_cpu(ev->flags);
ba2str(&ev->addr.bdaddr, addr);
DBG("hci%u addr %s, rssi %d flags 0x%04x ad_data_len %u",
index, addr, ev->rssi, flags, ad_data_len);
- confirm_name = (flags & MGMT_DEV_FOUND_CONFIRM_NAME);
- legacy = (flags & MGMT_DEV_FOUND_LEGACY_PAIRING);
- not_connectable = (flags & MGMT_DEV_FOUND_NOT_CONNECTABLE);
- name_resolve_failed = (flags & MGMT_DEV_FOUND_NAME_REQUEST_FAILED);
-
- btd_adapter_update_found_device(adapter, &ev->addr.bdaddr,
- ev->addr.type, ev->rssi, confirm_name,
- legacy, not_connectable,
- name_resolve_failed, ad_data,
+ btd_adapter_device_found(adapter, &ev->addr.bdaddr,
+ ev->addr.type, ev->rssi, flags, ad_data,
ad_data_len, true);
if (handle) {
--
2.40.1
