From patchwork Tue Oct 18 23:45:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 13011203 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0805DC433FE for ; Tue, 18 Oct 2022 23:46:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229491AbiJRXqH (ORCPT ); Tue, 18 Oct 2022 19:46:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbiJRXqG (ORCPT ); Tue, 18 Oct 2022 19:46:06 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3D92CD5C3 for ; Tue, 18 Oct 2022 16:46:05 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id z20so15299267plb.10 for ; Tue, 18 Oct 2022 16:46:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=3TjJI4Z5mKo0WkCCYEBgGhDf/q6wdCtS3DVL2EEYvvw=; b=cdfG4UHWshMEFMShafTRZy6qaGTTxzEPWjmr7POBYXhJkvgnS7TUdH3t9So1JARWX9 qzOhebTxpC8q4M//NTRoN+7FcHvzrLHp5uukVdrYhEPHJdE7/htz5brkiC//Ux22zmvW G7q9NciSUdXNtoR+HnFUarPasHt0c3FmZacsCZR/6t4/GSOo7pUan1SyEiSNHcz2hwnq rzLPsycjwO+elC70HAsMmV3KBmv6yJVHQn9dKZaK0AowgbmcPHHO5hAi7pex/phAS6GO rZwPkf+Gxjen9t6nUza9IM3XrgI3dZ7JJTlX1lqfjNnuvdcd5gTVt8Q9Yq4iR6UuI2Bh +W3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3TjJI4Z5mKo0WkCCYEBgGhDf/q6wdCtS3DVL2EEYvvw=; b=kfsKElqwZaEs6LlHSm0xn8rpbhQncjPridUMcqGL6ELx91++SXYKoIMYq0nDdRmsif /JLRL6iG1pHhBi6peJGbLw1ko9DyNySziez28ydL0bio8U7OglfTjrRgHeQSDoghaid0 R0n38Kbfqi8DS6456O8WfkGWanDlTxZjNaYQlHHUUbzXthvUOSEsIu8FUJVY7gdumix5 4WdUWTdXTNmeljjkW+FiZvGlfHoLnApFCeyiWgpiJecK0j9sz8LAzHTtbN2SVlIsJs3T dgjfMyD8S+dYk0EfY0K2Z8qZuuKYh813fwlp3f87k38UfRfJM8mf5rjBHEMkcfGlugag XNPw== X-Gm-Message-State: ACrzQf3UhX0p4oI5IjnqblLT8Efz1t+y1ctVoaSVQtqPs7Bs6qzTHU/1 UJkdV3rcBtAbxkykEmxKiDhRHsRMdN4= X-Google-Smtp-Source: AMsMyM64UnzrM4bmLuhCS78fJnD1AuW/ycs9kCbPzaIeesjjmeWWKTJfyIzWj6PYFU1WtxQiTpi4CA== X-Received: by 2002:a17:902:e982:b0:17f:ca1f:aa44 with SMTP id f2-20020a170902e98200b0017fca1faa44mr5477067plb.76.1666136764650; Tue, 18 Oct 2022 16:46:04 -0700 (PDT) Received: from lvondent-mobl4.. (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id ik3-20020a170902ab0300b00170d34cf7f3sm9137783plb.257.2022.10.18.16.46.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 16:46:02 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v2 1/3] settings: Fix scan-build warning Date: Tue, 18 Oct 2022 16:45:58 -0700 Message-Id: <20221018234600.3990980-1-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This fixes the following warning: src/settings.c:281:7: warning: Branch condition evaluates to a garbage value [core.uninitialized.Branch] if (ret) { ^~~ --- src/settings.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/settings.c b/src/settings.c index 0f053000610b..85534f2c7aca 100644 --- a/src/settings.c +++ b/src/settings.c @@ -269,6 +269,7 @@ static int gatt_db_load(struct gatt_db *db, GKeyFile *key_file, char **keys) &primary, &uuid); bt_uuid_to_string(&uuid, uuid_str, sizeof(uuid_str)); + ret = 0; } else if (g_str_equal(type, GATT_INCLUDE_UUID_STR)) { ret = load_incl(db, *handle, value, current_service); } else if (g_str_equal(type, GATT_CHARAC_UUID_STR)) { From patchwork Tue Oct 18 23:45:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 13011204 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8635EC433FE for ; Tue, 18 Oct 2022 23:46:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229612AbiJRXqK (ORCPT ); Tue, 18 Oct 2022 19:46:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229606AbiJRXqJ (ORCPT ); Tue, 18 Oct 2022 19:46:09 -0400 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9B7ACD5F9 for ; Tue, 18 Oct 2022 16:46:08 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id c24so15314364pls.9 for ; Tue, 18 Oct 2022 16:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=AQVOe4oCvjwQHwbJW6UYXvIxrMA6sYEZ8A+uwI77HZM=; b=TvFpGEdFJAlVlhaPNXyBr0D9D82AtjKQN76XX53pCBoYSRRcN0apLbT/2q46oi77iZ 5srZsTXwKGOV08didsyvvSFbE+BqnPI3dlC4btB1zc1ml1/1AdsvO/2+UEHFc6LaxqMX NZlDQRbt14ivmPQ7IqfkNdQA0029ngC1p36ep4/ZT6TzK4IBhOZWz0MjUBYvKYDNSJ9Z G/h3fULi3l7QpJqOoY34DokIDsMQa971mzBgQ4+rwzvXNwu2sKQZSMOv5uh6KozV3AKp ZS4km6ACltRAvHJx0YRMVEa3LB63hIF28ihUzab0WDFyIBa54//nW+kCEJjvcEqHtDQ0 NSrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AQVOe4oCvjwQHwbJW6UYXvIxrMA6sYEZ8A+uwI77HZM=; b=I1uJX6Q4PRswIDtLfCqd48PPxD9Vo9tR+kXRgxOtOC4zNWa8LYetnJ7zj/RJMGMpFb wu94GpwMMPFWuQIbdRQOCeWCVgfrHFKEEKn98w709G0IVynregK8rtz0VtgOKWA16LCU hczEsNxU4sVdbk9/4GlKM8INdNPTxOIC047sJAZMtvss+1x5ST2t2/AA+cyzI37sawbw z9BFDSpOc3uw7j2h+dtDsIRou8qOYKIuF5v4eptDjL97PLKGikepwip/+ZWQnEWHy7EO aMmbHWo000piKbvB+wa0+Ymb6BEau5pthqPxlcdtLZqnX1Zrq/FhmRWTn09C4jC+8BTk UNIA== X-Gm-Message-State: ACrzQf28DHJrSRTUEyO6FFMe9Xl5vLIT44BBpS95qoKY6wsIGKM1mlS/ 0eZ+P2sh/IEJlsDCipru3sXiLLR8AB0= X-Google-Smtp-Source: AMsMyM7kdbxe7llaAdKv697TcvDPbu8CxKfm2G3CgWBnRNRL4nEgqWydIqFeuPGn58x2sHefrKB6kA== X-Received: by 2002:a17:90b:3588:b0:20b:590:46a2 with SMTP id mm8-20020a17090b358800b0020b059046a2mr6276441pjb.14.1666136767647; Tue, 18 Oct 2022 16:46:07 -0700 (PDT) Received: from lvondent-mobl4.. (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id ik3-20020a170902ab0300b00170d34cf7f3sm9137783plb.257.2022.10.18.16.46.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 16:46:05 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v2 2/3] monitor/att: Detect cache changes Date: Tue, 18 Oct 2022 16:45:59 -0700 Message-Id: <20221018234600.3990980-2-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221018234600.3990980-1-luiz.dentz@gmail.com> References: <20221018234600.3990980-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This attempts to detect if the were any changes on cache files since they were last loaded and then attempt to reload them. --- monitor/att.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/monitor/att.c b/monitor/att.c index 491f196bf38d..7a4125567498 100644 --- a/monitor/att.c +++ b/monitor/att.c @@ -22,6 +22,7 @@ #include #include #include +#include #include @@ -2426,7 +2427,9 @@ struct att_read { struct att_conn_data { struct gatt_db *ldb; + struct timespec ldb_mtim; struct gatt_db *rdb; + struct timespec rdb_mtim; struct queue *reads; }; @@ -2440,6 +2443,28 @@ static void att_conn_data_free(void *data) free(att_data); } +static void gatt_load_db(struct gatt_db *db, const char *filename, + struct timespec *mtim) +{ + struct stat st; + + if (lstat(filename, &st)) + return; + + if (!gatt_db_isempty(db)) { + /* Check if file has been modified since last time */ + if (st.st_mtim.tv_sec == mtim->tv_sec && + st.st_mtim.tv_nsec == mtim->tv_nsec) + return; + /* Clear db before reloading */ + gatt_db_clear(db); + } + + *mtim = st.st_mtim; + + btd_settings_gatt_db_load(db, filename); +} + static void load_gatt_db(struct packet_conn_data *conn) { struct att_conn_data *data = conn->data; @@ -2455,22 +2480,14 @@ static void load_gatt_db(struct packet_conn_data *conn) conn->destroy = att_conn_data_free; } - if (!gatt_db_isempty(data->ldb) && !gatt_db_isempty(data->rdb)) - return; - ba2str((bdaddr_t *)conn->src, local); ba2str((bdaddr_t *)conn->dst, peer); - if (gatt_db_isempty(data->ldb)) { - create_filename(filename, PATH_MAX, "/%s/attributes", local); - btd_settings_gatt_db_load(data->ldb, filename); - } + create_filename(filename, PATH_MAX, "/%s/attributes", local); + gatt_load_db(data->ldb, filename, &data->ldb_mtim); - if (gatt_db_isempty(data->rdb)) { - create_filename(filename, PATH_MAX, "/%s/cache/%s", local, - peer); - btd_settings_gatt_db_load(data->rdb, filename); - } + create_filename(filename, PATH_MAX, "/%s/cache/%s", local, peer); + gatt_load_db(data->rdb, filename, &data->rdb_mtim); } static struct gatt_db_attribute *get_attribute(const struct l2cap_frame *frame, From patchwork Tue Oct 18 23:46:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 13011205 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3340BC4332F for ; Tue, 18 Oct 2022 23:46:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229564AbiJRXqO (ORCPT ); Tue, 18 Oct 2022 19:46:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229606AbiJRXqN (ORCPT ); Tue, 18 Oct 2022 19:46:13 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 35721CD5C6 for ; Tue, 18 Oct 2022 16:46:12 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id t10-20020a17090a4e4a00b0020af4bcae10so15430539pjl.3 for ; Tue, 18 Oct 2022 16:46:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=qdeBnWLi1p2OWSh/6GSZ28/2GrjhlAjLt5fiAujUhM4=; b=PQkZiM6Z9OH+tadRYYz1ml804enRYF0N56cnlaCCvfBo/5dbr5+nM8FF2xpq1fi44v gwp/unfQG8xtPi/LX3/vCaK0y0KpU9Hq/a25bI+HZZQF+n+8AJGM1nuAnKpDQP28c0MM sG7nqFQEArHEoQqYah/12rdL7N5GlmmevcMZ6LKgv2z/kw2qifH6LVgzxAuMM2obIeur l9hK106C5prPycVSJGrUii/M3YsOMsCJSgu0PQ/mPVtq/OCiy9Hd+K4wt/HiMSd9Pmx1 oyz5TrxdPCLFggxFddd9H+htgY77VIziwK3N6uEBZXyJias9/756JaT5238g/NGkAl9z eAQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qdeBnWLi1p2OWSh/6GSZ28/2GrjhlAjLt5fiAujUhM4=; b=0lXwwWKU4gPBAiNbpzTB+REwb3eh+7XxjrYQx1ic9GZrWCoVcr7Yo16oqW9o7kJpBR KClGzc1l/lvL+9cAe9ubruHPIVhrvjHUILOlr40TQwL6iPSvQHY8LxN9izGWvq1dxl2G O+5JW0xOijOkqJBZshP93RavOpBGJmyZ6ucQeGh3cSWflWZHtwgTVmUYTdCRhwcZe/Tw pzjr2AkhhRlfnPrHvbOPGEjY1nqxv4Cfjs1rfpr9kP0W+5msvv1sGV+fk8O3y9sOJ/nC NFMuUUQxfWVw9j0WVOb1ZDcbqsjvnLrKQ0hEuEN3ZGWaqyWpGPw9mpHce/nlw4pUeDtz uimg== X-Gm-Message-State: ACrzQf0OzAiA8U6egvudRMnJdO3IJpkmCMFl92Vs4k55n+VE73+C8rLK BHsG1O7KGUPGygBoA67CjUgYDrvQ39g= X-Google-Smtp-Source: AMsMyM7/8emveGIiy5db/rV83qrYLcPHcJN4B5SEIVedaQg4xCeI8z4kQi7fVfnctD6idIpmd8GV+Q== X-Received: by 2002:a17:90a:e7c8:b0:20d:6c60:c38 with SMTP id kb8-20020a17090ae7c800b0020d6c600c38mr6374404pjb.26.1666136771152; Tue, 18 Oct 2022 16:46:11 -0700 (PDT) Received: from lvondent-mobl4.. (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id ik3-20020a170902ab0300b00170d34cf7f3sm9137783plb.257.2022.10.18.16.46.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Oct 2022 16:46:09 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v2 3/3] monitor/att: Revert treating Notification/Indication as a request Date: Tue, 18 Oct 2022 16:46:00 -0700 Message-Id: <20221018234600.3990980-3-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221018234600.3990980-1-luiz.dentz@gmail.com> References: <20221018234600.3990980-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz Notification/Indication shall be treated as response (rsp=true) so the correct database is used: > ACL Data RX: Handle 3585 flags 0x02 dlen 14 ATT: Handle Value Notification (0x1b) len 9 Handle: 0x002a Type: Report (0x2a4d) Data: 0000feffff0000 --- monitor/att.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor/att.c b/monitor/att.c index 7a4125567498..fbd75db03b83 100644 --- a/monitor/att.c +++ b/monitor/att.c @@ -2785,7 +2785,7 @@ static void print_notify(const struct l2cap_frame *frame, uint16_t handle, struct gatt_handler *handler; struct l2cap_frame clone; - print_handle(frame, handle, false); + print_handle(frame, handle, true); print_hex_field(" Data", frame->data, len); if (len > frame->size) {