diff mbox series

[Bluez,1/3] Listen and process remote name resolving failure

Message ID 20211111195423.Bluez.1.I9fc087b25433a9347b2d8c8ff7a25fadf448ef49@changeid (mailing list archive)
State Superseded
Headers show
Series [Bluez,1/3] Listen and process remote name resolving failure | expand

Checks

Context Check Description
tedd_an/checkpatch success Checkpatch PASS
tedd_an/gitlint fail [Bluez,1/3] Listen and process remote name resolving failure 15: B1 Line exceeds max length (121>80): "https://patchwork.kernel.org/project/bluetooth/patch/20211028191805.1.I35b7f3a496f834de6b43a32f94b6160cb1467c94@changeid/"
tedd_an/setupell success Setup ELL PASS
tedd_an/buildprep success Build Prep PASS
tedd_an/build success Build Configuration PASS
tedd_an/makecheck fail Make Check FAIL: android/bluetooth.c: In function ‘confirm_device_name’: android/bluetooth.c:1534:5: error: ‘struct mgmt_cp_confirm_name’ has no member named ‘name_known’ 1534 | cp.name_known = 1; | ^ make[1]: *** [Makefile:6992: android/bluetooth.o] Error 1 make: *** [Makefile:10501: check] Error 2
tedd_an/makedistcheck fail Make Distcheck Make FAIL: ../../android/bluetooth.c: In function ‘confirm_device_name’: ../../android/bluetooth.c:1534:5: error: ‘struct mgmt_cp_confirm_name’ has no member named ‘name_known’ 1534 | cp.name_known = 1; | ^ make[2]: *** [Makefile:6992: android/bluetooth.o] Error 1 make[1]: *** [Makefile:4175: all] Error 2 make: *** [Makefile:10422: distcheck] Error 1
tedd_an/build_extell success Build External ELL PASS
tedd_an/build_extell_make fail Build Make with External ELL FAIL: android/bluetooth.c: In function ‘confirm_device_name’: android/bluetooth.c:1534:5: error: ‘struct mgmt_cp_confirm_name’ has no member named ‘name_known’ 1534 | cp.name_known = 1; | ^ make[1]: *** [Makefile:6992: android/bluetooth.o] Error 1 make: *** [Makefile:4175: all] Error 2

Commit Message

Archie Pusaka Nov. 11, 2021, 11:54 a.m. UTC 
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(-)

Comments

bluez.test.bot@gmail.com Nov. 11, 2021, 12:45 p.m. UTC | #1 
This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=578681

---Test result---

Test Summary:
CheckPatch                    PASS      4.61 seconds
GitLint                       FAIL      2.88 seconds
Prep - Setup ELL              PASS      49.89 seconds
Build - Prep                  PASS      0.50 seconds
Build - Configure             PASS      9.24 seconds
Build - Make                  FAIL      108.25 seconds
Make Check                    FAIL      0.84 seconds
Make Distcheck                FAIL      111.72 seconds
Build w/ext ELL - Configure   PASS      9.19 seconds
Build w/ext ELL - Make        FAIL      95.10 seconds

Details
##############################
Test: GitLint - FAIL
Desc: Run gitlint with rule in .gitlint
Output:
[Bluez,1/3] Listen and process remote name resolving failure
15: B1 Line exceeds max length (121>80): "https://patchwork.kernel.org/project/bluetooth/patch/20211028191805.1.I35b7f3a496f834de6b43a32f94b6160cb1467c94@changeid/"


##############################
Test: Build - Make - FAIL
Desc: Build the BlueZ source tree
Output:
android/bluetooth.c: In function ‘confirm_device_name’:
android/bluetooth.c:1534:5: error: ‘struct mgmt_cp_confirm_name’ has no member named ‘name_known’
 1534 |   cp.name_known = 1;
      |     ^
make[1]: *** [Makefile:6992: android/bluetooth.o] Error 1
make: *** [Makefile:4175: all] Error 2


##############################
Test: Make Check - FAIL
Desc: Run 'make check'
Output:
android/bluetooth.c: In function ‘confirm_device_name’:
android/bluetooth.c:1534:5: error: ‘struct mgmt_cp_confirm_name’ has no member named ‘name_known’
 1534 |   cp.name_known = 1;
      |     ^
make[1]: *** [Makefile:6992: android/bluetooth.o] Error 1
make: *** [Makefile:10501: check] Error 2


##############################
Test: Make Distcheck - FAIL
Desc: Run distcheck to check the distribution
Output:
../../android/bluetooth.c: In function ‘confirm_device_name’:
../../android/bluetooth.c:1534:5: error: ‘struct mgmt_cp_confirm_name’ has no member named ‘name_known’
 1534 |   cp.name_known = 1;
      |     ^
make[2]: *** [Makefile:6992: android/bluetooth.o] Error 1
make[1]: *** [Makefile:4175: all] Error 2
make: *** [Makefile:10422: distcheck] Error 1


##############################
Test: Build w/ext ELL - Make - FAIL
Desc: Build BlueZ source with '--enable-external-ell' configuration
Output:
android/bluetooth.c: In function ‘confirm_device_name’:
android/bluetooth.c:1534:5: error: ‘struct mgmt_cp_confirm_name’ has no member named ‘name_known’
 1534 |   cp.name_known = 1;
      |     ^
make[1]: *** [Makefile:6992: android/bluetooth.o] Error 1
make: *** [Makefile:4175: all] Error 2




---
Regards,
Linux Bluetooth
diff mbox series

Patch

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);