All of lore.kernel.org
 help / color / mirror / Atom feed
* [Bluez PATCH 1/3] Listen and process remote name resolving failure
@ 2021-11-11 11:54 Archie Pusaka
  2021-11-11 11:54 ` [Bluez PATCH 2/3] device: Save remote name request attempts into cache file Archie Pusaka
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Archie Pusaka @ 2021-11-11 11:54 UTC (permalink / raw)
  To: linux-bluetooth, Luiz Augusto von Dentz, Marcel Holtmann
  Cc: CrosBT Upstreaming, Archie Pusaka, Sonny Sasaka, Miao-chen Chou

From: Archie Pusaka <apusaka@chromium.org>

When Remote Name Resolve ends with failure, record this occurrence and
prevent remote name resolving for the same device for some time.
Increase the time duration for subsequent failures.

Reviewed-by: Sonny Sasaka <sonnysasaka@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
---
Hi maintainers,

This is the patch series for remote name request as was discussed here.
https://patchwork.kernel.org/project/bluetooth/patch/20211028191805.1.I35b7f3a496f834de6b43a32f94b6160cb1467c94@changeid/
Please also review the corresponding kernel space change.

 lib/mgmt.h     |  7 ++++++-
 src/adapter.c  | 30 ++++++++++++++++++++++++------
 src/device.c   | 23 +++++++++++++++++++++++
 src/device.h   |  2 ++
 tools/btmgmt.c |  4 ++--
 5 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/lib/mgmt.h b/lib/mgmt.h
index 0d1678f01d..c006793d84 100644
--- a/lib/mgmt.h
+++ b/lib/mgmt.h
@@ -299,10 +299,14 @@ struct mgmt_cp_stop_discovery {
 	uint8_t type;
 } __packed;
 
+#define MGMT_CONFIRM_NAME_UNKNOWN	0
+#define MGMT_CONFIRM_NAME_KNOWN		1
+#define MGMT_CONFIRM_NAME_DONT_CARE	2
+
 #define MGMT_OP_CONFIRM_NAME		0x0025
 struct mgmt_cp_confirm_name {
 	struct mgmt_addr_info addr;
-	uint8_t name_known;
+	uint8_t name_state;
 } __packed;
 struct mgmt_rp_confirm_name {
 	struct mgmt_addr_info addr;
@@ -856,6 +860,7 @@ struct mgmt_ev_auth_failed {
 #define MGMT_DEV_FOUND_CONFIRM_NAME	0x01
 #define MGMT_DEV_FOUND_LEGACY_PAIRING	0x02
 #define MGMT_DEV_FOUND_NOT_CONNECTABLE	0x04
+#define MGMT_DEV_FOUND_NAME_RESOLVE_FAIL 0x10
 
 #define MGMT_EV_DEVICE_FOUND		0x0012
 struct mgmt_ev_device_found {
diff --git a/src/adapter.c b/src/adapter.c
index d0d38621b8..9a43ca4ca5 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -6796,7 +6796,8 @@ static void confirm_name_complete(uint8_t status, uint16_t length,
 }
 
 static void confirm_name(struct btd_adapter *adapter, const bdaddr_t *bdaddr,
-					uint8_t bdaddr_type, bool name_known)
+					uint8_t bdaddr_type, bool name_known,
+					bool name_resolve_allowed)
 {
 	struct mgmt_cp_confirm_name cp;
 	char addr[18];
@@ -6827,7 +6828,13 @@ static void confirm_name(struct btd_adapter *adapter, const bdaddr_t *bdaddr,
 	memset(&cp, 0, sizeof(cp));
 	bacpy(&cp.addr.bdaddr, bdaddr);
 	cp.addr.type = bdaddr_type;
-	cp.name_known = name_known;
+
+	if (name_known)
+		cp.name_state = MGMT_CONFIRM_NAME_KNOWN;
+	else if (name_resolve_allowed)
+		cp.name_state = MGMT_CONFIRM_NAME_UNKNOWN;
+	else
+		cp.name_state = MGMT_CONFIRM_NAME_DONT_CARE;
 
 	adapter->confirm_name_id = mgmt_reply(adapter->mgmt,
 					MGMT_OP_CONFIRM_NAME,
@@ -6989,12 +6996,13 @@ static void update_found_devices(struct btd_adapter *adapter,
 					uint8_t bdaddr_type, int8_t rssi,
 					bool confirm, bool legacy,
 					bool not_connectable,
+					bool name_resolve_fail,
 					const uint8_t *data, uint8_t data_len)
 {
 	struct btd_device *dev;
 	struct bt_ad *ad = NULL;
 	struct eir_data eir_data;
-	bool name_known, discoverable;
+	bool name_known, discoverable, name_resolve_allowed;
 	char addr[18];
 	bool duplicate = false;
 	struct queue *matched_monitors = NULL;
@@ -7081,6 +7089,9 @@ static void update_found_devices(struct btd_adapter *adapter,
 
 	device_set_legacy(dev, legacy);
 
+	if (name_resolve_fail)
+		device_name_resolve_fail(dev);
+
 	if (adapter->filtered_discovery)
 		device_set_rssi_with_delta(dev, rssi, 0);
 	else
@@ -7151,8 +7162,11 @@ static void update_found_devices(struct btd_adapter *adapter,
 	if (g_slist_find(adapter->discovery_found, dev))
 		return;
 
-	if (confirm)
-		confirm_name(adapter, bdaddr, bdaddr_type, name_known);
+	if (confirm) {
+		name_resolve_allowed = device_name_resolve_allowed(dev);
+		confirm_name(adapter, bdaddr, bdaddr_type, name_known,
+							name_resolve_allowed);
+	}
 
 	adapter->discovery_found = g_slist_prepend(adapter->discovery_found,
 									dev);
@@ -7201,6 +7215,8 @@ static void device_found_callback(uint16_t index, uint16_t length,
 	uint32_t flags;
 	bool confirm_name;
 	bool legacy;
+	bool not_connectable;
+	bool name_resolve_fail;
 	char addr[18];
 
 	if (length < sizeof(*ev)) {
@@ -7230,10 +7246,12 @@ static void device_found_callback(uint16_t index, uint16_t length,
 
 	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_fail = (flags & MGMT_DEV_FOUND_NAME_RESOLVE_FAIL);
 
 	update_found_devices(adapter, &ev->addr.bdaddr, ev->addr.type,
 					ev->rssi, confirm_name, legacy,
-					flags & MGMT_DEV_FOUND_NOT_CONNECTABLE,
+					not_connectable, name_resolve_fail,
 					eir, eir_len);
 }
 
diff --git a/src/device.c b/src/device.c
index fdc2d50a47..699faeba3b 100644
--- a/src/device.c
+++ b/src/device.c
@@ -79,6 +79,8 @@
 #define GATT_INCLUDE_UUID_STR "2802"
 #define GATT_CHARAC_UUID_STR "2803"
 
+#define NAME_RESOLVE_RETRY_DELAY	120 /* seconds */
+
 static DBusConnection *dbus_conn = NULL;
 static unsigned service_state_cb_id;
 
@@ -272,6 +274,9 @@ struct btd_device {
 
 	GIOChannel	*att_io;
 	guint		store_id;
+
+	time_t		name_resolve_earliest_allow_time;
+	uint8_t		name_resolve_fail_count;
 };
 
 static const uint16_t uuid_list[] = {
@@ -4361,6 +4366,24 @@ bool device_name_known(struct btd_device *device)
 	return device->name[0] != '\0';
 }
 
+bool device_name_resolve_allowed(struct btd_device *device)
+{
+	return time(NULL) >= device->name_resolve_earliest_allow_time;
+}
+
+void device_name_resolve_fail(struct btd_device *device)
+{
+	if (!device)
+		return;
+
+	/* Punish this device by not allowing name resolve for some time.
+	 * increase punishment time for subsequent failures.
+	 */
+	device->name_resolve_fail_count++;
+	device->name_resolve_earliest_allow_time = time(NULL) +
+		NAME_RESOLVE_RETRY_DELAY * device->name_resolve_fail_count;
+}
+
 void device_set_class(struct btd_device *device, uint32_t class)
 {
 	if (device->class == class)
diff --git a/src/device.h b/src/device.h
index 5f615cb4b6..76d79855f8 100644
--- a/src/device.h
+++ b/src/device.h
@@ -25,6 +25,8 @@ void btd_device_device_set_name(struct btd_device *device, const char *name);
 void device_store_cached_name(struct btd_device *dev, const char *name);
 void device_get_name(struct btd_device *device, char *name, size_t len);
 bool device_name_known(struct btd_device *device);
+bool device_name_resolve_allowed(struct btd_device *device);
+void device_name_resolve_fail(struct btd_device *device);
 void device_set_class(struct btd_device *device, uint32_t class);
 void device_update_addr(struct btd_device *device, const bdaddr_t *bdaddr,
 							uint8_t bdaddr_type);
diff --git a/tools/btmgmt.c b/tools/btmgmt.c
index 42ef9acefa..14d05efa45 100644
--- a/tools/btmgmt.c
+++ b/tools/btmgmt.c
@@ -667,9 +667,9 @@ static void device_found(uint16_t index, uint16_t len, const void *param,
 		memset(&cp, 0, sizeof(cp));
 		memcpy(&cp.addr, &ev->addr, sizeof(cp.addr));
 		if (resolve_names)
-			cp.name_known = 0;
+			cp.name_state = MGMT_CONFIRM_NAME_UNKNOWN;
 		else
-			cp.name_known = 1;
+			cp.name_state = MGMT_CONFIRM_NAME_DONT_CARE;
 
 		mgmt_reply(mgmt, MGMT_OP_CONFIRM_NAME, index, sizeof(cp), &cp,
 						confirm_name_rsp, NULL, NULL);
-- 
2.34.0.rc0.344.g81b53c2807-goog


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2021-11-12  3:11 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-11 11:54 [Bluez PATCH 1/3] Listen and process remote name resolving failure Archie Pusaka
2021-11-11 11:54 ` [Bluez PATCH 2/3] device: Save remote name request attempts into cache file Archie Pusaka
2021-11-11 11:54 ` [Bluez PATCH 3/3] doc: Add Name Resolve Fail flag in device found event Archie Pusaka
2021-11-11 16:35   ` Marcel Holtmann
2021-11-12  3:10     ` Archie Pusaka
2021-11-11 12:45 ` [Bluez,1/3] Listen and process remote name resolving failure bluez.test.bot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.