From patchwork Mon Nov 15 09:06:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archie Pusaka X-Patchwork-Id: 12619113 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF959C433F5 for ; Mon, 15 Nov 2021 09:06:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CE9A56321A for ; Mon, 15 Nov 2021 09:06:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236481AbhKOJJu (ORCPT ); Mon, 15 Nov 2021 04:09:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236411AbhKOJJf (ORCPT ); Mon, 15 Nov 2021 04:09:35 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09930C061766 for ; Mon, 15 Nov 2021 01:06:39 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id v7-20020a25ab87000000b005c2130838beso25982358ybi.0 for ; Mon, 15 Nov 2021 01:06:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=jDHvBd+Hfi1pIRJAz3nMt35Oxhkb5zlffgJspuw39Yg=; b=ENkk1xMvWD/C93oBmTgAjhFUfFUwnniIpLAFsewCK80x2lS7ARmrVnrf+rpVJk3BaC 1dXvzrBRijj4FFXSNBhxgeFNrNlv0K/7OmOOWz43j341B4EBaxAk861WC9B/a2O9Tiyp U/88CQH+dUO15aYoYGwgNXS0alrthlcT7f7kQktZBKCPv+7rKryEJVxx0aALltDIaTVp 7gTfKTN538qSmQraYbepg9pBucUNuqN017I2hBqRRffMYVir2yTd4LO6XKK756JF+eBr N5wyBiAkDYMTSQi6xIpo55MPxLv3BBOjVmOv1CRNHG9O+mxr5tABTzriOB+6IbZ3uFdw DRJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=jDHvBd+Hfi1pIRJAz3nMt35Oxhkb5zlffgJspuw39Yg=; b=rxbo5eJ9qH2vhf8ZJLG92i5WPP0x61pOWFxIHgx4Him+WBB7Xc/OR3FAeyepM7QE6n i9P6XzpA7cY8JPSG7ecEMDAmluBf/ahHM4brB66f6UTrlg0KngLXX9KssA9tAMcn6DsW kC17x+EbEraTTjM6a+dxv/QaGrvA26eqNImdkWz4W696rTPc3ddNy9gM9h8/+6t3h6rx iQ/kvgQtc83mFE+9T+xdRattZKdSG93D1vpZxm+yg0O3C91SaI1kq1geoPB+GFn0s+1G QMMGgXoXcEbjRsNwjrWPEgCUoz7ZyCIhIKEIWeAbibnT+NWGUUQcQqH60M5dHTGaZQDR YTkA== X-Gm-Message-State: AOAM532sqKhaiTSZKYq3j2JDefJtUa4dLa37OKpuKQLyOjhx0Ab35QDb 5CfatFraw4/sMjyvrJ5YgMAiHE+G1f9hwefjj4kdRxldyXuftH6OXdJJ/Sswci1wLOqayiT2xWf pIe4y81UEYZUrWfUGOrbMD/AixJkr8fXeFmJO8enOhGvjZ0p97iJBlUyARR30kL05w1FP5aTIYH hX X-Google-Smtp-Source: ABdhPJwseCU9bCD3wSt8xrNzfaj6VcEHdfujRPJBzxHBeql3Cgz35nC2KNnFen/OXykA2D7X4x+6DYCZJ8nf X-Received: from apusaka-p920.tpe.corp.google.com ([2401:fa00:1:10:5c8f:7191:e5ca:14fb]) (user=apusaka job=sendgmr) by 2002:a25:ba0f:: with SMTP id t15mr42098345ybg.62.1636967198149; Mon, 15 Nov 2021 01:06:38 -0800 (PST) Date: Mon, 15 Nov 2021 17:06:22 +0800 Message-Id: <20211115170538.Bluez.v2.1.I9fc087b25433a9347b2d8c8ff7a25fadf448ef49@changeid> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.0.rc1.387.gb447b232ab-goog Subject: [Bluez PATCH v2 1/3] Listen and process remote name resolving failure From: Archie Pusaka To: linux-bluetooth , Luiz Augusto von Dentz , Marcel Holtmann Cc: CrosBT Upstreaming , Archie Pusaka Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Archie Pusaka 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. --- 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. Changes in v2: * Stay silent instead of sending MGMT_OP_CONFIRM_NAME with DONT_CARE flag. lib/mgmt.h | 1 + src/adapter.c | 15 +++++++++++++-- src/device.c | 23 +++++++++++++++++++++++ src/device.h | 2 ++ 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/lib/mgmt.h b/lib/mgmt.h index 0d1678f01d..468d31cafb 100644 --- a/lib/mgmt.h +++ b/lib/mgmt.h @@ -856,6 +856,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_FAILED 0x10 #define MGMT_EV_DEVICE_FOUND 0x0012 struct mgmt_ev_device_found { diff --git a/src/adapter.c b/src/adapter.c index d0d38621b8..0003bc5d42 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -6989,6 +6989,7 @@ 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_failed, const uint8_t *data, uint8_t data_len) { struct btd_device *dev; @@ -7081,6 +7082,9 @@ static void update_found_devices(struct btd_adapter *adapter, device_set_legacy(dev, legacy); + if (name_resolve_failed) + device_name_resolve_fail(dev); + if (adapter->filtered_discovery) device_set_rssi_with_delta(dev, rssi, 0); else @@ -7151,7 +7155,10 @@ static void update_found_devices(struct btd_adapter *adapter, if (g_slist_find(adapter->discovery_found, dev)) return; - if (confirm) + /* If name is unknown but it's not allowed to resolve, don't send + * MGMT_OP_CONFIRM_NAME. + */ + if (confirm && (name_known || device_name_resolve_allowed(dev))) confirm_name(adapter, bdaddr, bdaddr_type, name_known); adapter->discovery_found = g_slist_prepend(adapter->discovery_found, @@ -7201,6 +7208,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_failed; char addr[18]; if (length < sizeof(*ev)) { @@ -7230,10 +7239,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_failed = (flags & MGMT_DEV_FOUND_NAME_RESOLVE_FAILED); 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_failed, 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);