From patchwork Thu Mar 16 21:33:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inga Stotland X-Patchwork-Id: 665023 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 B8187C74A5B for ; Thu, 16 Mar 2023 21:33:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229629AbjCPVdu (ORCPT ); Thu, 16 Mar 2023 17:33:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229547AbjCPVdt (ORCPT ); Thu, 16 Mar 2023 17:33:49 -0400 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5868915566 for ; Thu, 16 Mar 2023 14:33:47 -0700 (PDT) Received: by mail-pg1-x534.google.com with SMTP id q189so1777981pga.9 for ; Thu, 16 Mar 2023 14:33:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679002426; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=l8OzTrsEcHCwFQ2aor7oLcsMwgf1mleTA2gfRlLRbWY=; b=fLYCqCFWBkm0CKciYfnOJGKIza3CSvnwEv+kCkrv+ZaRT3ZXEwWsGJ6vFh/v1QqWrn Yb31EZ7pQCfXg+tEdoR038DfGk8PG5K8IwWp9k0zzdlUIzxCxueNbppCN71sAQPIzLkG dz5VvK7zzsReMTVGfWC/c5Rzx2Yd+FOyxthkJKbKU+IPai/GzZ4AipYQm5I1FMYpkvY3 5PZK+OZWxNss6Rt+HUCOgpxDqzJA5mLU6LPeR1HHxa2SSWBzoGc91W4h9CBQztVnNpeh pFpfBFQIRxFJuqhkWmZlSqUGJO3pa/obAu+6zWbdW7Ot0/GgQM/5zrIon0MHwI2S++eN ZVcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679002426; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=l8OzTrsEcHCwFQ2aor7oLcsMwgf1mleTA2gfRlLRbWY=; b=o35+9cvvUOvITr2t1BY61GFvnKjJTkoCZoz+ACqOo9rZAPRJ2QNvgZGcXw77OWiTN7 Mpz+nojbXSB2gRwyWPpHPBmwudh/0u1tdedDOdYATMkoirkiUWy1clErMtjfLf+hTHLD a+tFUwn6K+ONofdvfermYo66mNsPCuVQwmNrky9Gtqq3MqE6SOb6qzSwR+C7PQgt1nAz 7+dyUxeQfysvlCDwSn7//y/BplGLoREfjnjWXc9DBa55ZeiUOVCPzqDeykrSEh/IqNPG raeEECmt6z/wayRUvo0AuVO5KEZJH4OerXXwP5k+XqwhsKN+00XthVW74xhjgD0SiwMR q+mw== X-Gm-Message-State: AO0yUKWoJC5Rbv4M7DoSGCmVHKsPzYyjO+V0IL1eZjCclttSOkabmRqA hLYG4desnJ4OFs8IMzwPN+17lnCuH6J0cjJE X-Google-Smtp-Source: AK7set/lTL35oMTLdB93doe8ppjlTxKnmqM/ddtrirU+67pl6BCjTIbZ32xnVDqE7J33cmpMps4Hrg== X-Received: by 2002:aa7:9736:0:b0:5aa:4df7:7eef with SMTP id k22-20020aa79736000000b005aa4df77eefmr4187673pfg.6.1679002426557; Thu, 16 Mar 2023 14:33:46 -0700 (PDT) Received: from fedora.. (c-67-170-58-107.hsd1.wa.comcast.net. [67.170.58.107]) by smtp.googlemail.com with ESMTPSA id k17-20020a63d111000000b004fbb4a55b64sm95195pgg.86.2023.03.16.14.33.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:33:46 -0700 (PDT) From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@gmail.com, brian.gix@intel.com, Inga Stotland Subject: [PATCH BlueZ v2 1/2] tools/mesh-cfgclient: Prevent storing duplicate models Date: Thu, 16 Mar 2023 14:33:11 -0700 Message-Id: <20230316213312.159370-1-inga.stotland@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This fixes the situation when subsequent requests to get a node composition result in appending element's model list with duplicate models. This adds a check for a presence of a model on an element when attempting to add a new model ID to a model list on this element. --- tools/mesh/mesh-db.c | 17 ++++++++++++----- tools/mesh/remote.c | 9 +++++++++ 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/tools/mesh/mesh-db.c b/tools/mesh/mesh-db.c index c0c05a29a..1d047691d 100644 --- a/tools/mesh/mesh-db.c +++ b/tools/mesh/mesh-db.c @@ -1964,28 +1964,35 @@ bool mesh_db_node_set_composition(uint16_t unicast, uint8_t *data, uint16_t len) while (len >= 2 && m--) { mod_id = l_get_le16(data); + data += 2; + len -= 2; + + jobj = get_model(unicast, unicast + i, mod_id, false); + if (jobj) + continue; jobj = init_model(mod_id); if (!jobj) goto fail; json_object_array_add(jmods, jobj); - data += 2; - len -= 2; } while (len >= 4 && v--) { mod_id = l_get_le16(data + 2); mod_id = l_get_le16(data) << 16 | mod_id; + data += 4; + len -= 4; + + jobj = get_model(unicast, unicast + i, mod_id, true); + if (jobj) + continue; jobj = init_vendor_model(mod_id); if (!jobj) goto fail; json_object_array_add(jmods, jobj); - - data += 4; - len -= 4; } i++; diff --git a/tools/mesh/remote.c b/tools/mesh/remote.c index cee711dec..b917ae9df 100644 --- a/tools/mesh/remote.c +++ b/tools/mesh/remote.c @@ -54,6 +54,11 @@ struct rejected_addr { static struct l_queue *nodes; static struct l_queue *reject_list; +static bool match_mod_id(const void *a, const void *b) +{ + return a == b; +} + static int compare_mod_id(const void *a, const void *b, void *user_data) { uint32_t id1 = L_PTR_TO_UINT(a); @@ -227,6 +232,10 @@ bool remote_set_model(uint16_t unicast, uint8_t ele_idx, uint32_t mod_id, if (!vendor) mod_id = VENDOR_ID_MASK | mod_id; + if (l_queue_find(rmt->els[ele_idx], match_mod_id, + L_UINT_TO_PTR(mod_id))) + return true; + l_queue_insert(rmt->els[ele_idx], L_UINT_TO_PTR(mod_id), compare_mod_id, NULL); From patchwork Thu Mar 16 21:33:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Inga Stotland X-Patchwork-Id: 664116 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 74082C6FD1F for ; Thu, 16 Mar 2023 21:33:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230075AbjCPVdw (ORCPT ); Thu, 16 Mar 2023 17:33:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229547AbjCPVdv (ORCPT ); Thu, 16 Mar 2023 17:33:51 -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 9A7D522110 for ; Thu, 16 Mar 2023 14:33:49 -0700 (PDT) Received: by mail-pl1-x629.google.com with SMTP id bc12so2627968plb.0 for ; Thu, 16 Mar 2023 14:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679002429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=csyHtbmv3B6fRpTZjS5Iu22tgwlPlwtuJTzvRjWon20=; b=WryxhSgVZpFAxSlnAqkXiOh436VWxcnuwivUtVpfBY/wNQPAU3LMoacE8chRBb102y mi3OQKahk8lBtd08G/Lf98+/BLoGuTs7kZOgRZwYzt70CcFgpBL6TMdNpIFIsvBuF1mR qwhyBvGI5gxSGtbx8mXI8hqu0XiwC0hgsuk1FKyhOLFsfZ/LO74m816e0fzBjvkGY1lS KxEGoMDeWv0qMvrG71bu3nJ0YqOyZ/A+dyUq91G076xEl6Ez8uKtWTNWiJ73GUjyPXs1 HpWelvnZEEw5LhbfvL3T7p83jc/31yW/BL0XVFzHGemubEGbX3B4c3oo73npWF9blOz0 QWew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679002429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=csyHtbmv3B6fRpTZjS5Iu22tgwlPlwtuJTzvRjWon20=; b=M0+49rJ1wMYJJl5yZC+PhSI9xIZ9rTxBri+H76BI6uJAlnoHvbmDNVB4WObryoENE0 y6ZijkWOLUv7SG6QemQ5soI+Yx6fZgCUPJJnBwwmPVXX+WDrVR2QharLUxO1jP1aeRYh SHX2pJy0HQbRC6sKCoy0pT1IxvHFmh2OEkul9yhxQs9uwZCrKVrgdBab/7JlNxI4CtQi TM+/jP1O6+xVrTz0Cg8NjG9or8QMs9ifEO7VZGH0cE536h2KCRLpVWKlnYnZx6UMGdXJ ZbYbok5riOhT01W4K1qIjL0Dz5PvJuZ8bvhLNniztbV0z+TfRKHtP7EGS4qNdOSx8VMc XgwA== X-Gm-Message-State: AO0yUKV3nD3upabUOnHqaJwg6rE4euPT270VJ9Jtu6HXbq6eFTdjg7mM M9jfDfVAkSeDmPSUQlDFZcJ1XHWhOHWPuiP/ X-Google-Smtp-Source: AK7set8WifRRstMOUbBixOXH89x5qSD02JK66ga0bvsv986xEejLL9xLwEc6k8fLzrD4k2hFLa1gIg== X-Received: by 2002:a05:6a20:1d58:b0:d3:aba7:807c with SMTP id cs24-20020a056a201d5800b000d3aba7807cmr3882891pzb.34.1679002428832; Thu, 16 Mar 2023 14:33:48 -0700 (PDT) Received: from fedora.. (c-67-170-58-107.hsd1.wa.comcast.net. [67.170.58.107]) by smtp.googlemail.com with ESMTPSA id k17-20020a63d111000000b004fbb4a55b64sm95195pgg.86.2023.03.16.14.33.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 14:33:48 -0700 (PDT) From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@gmail.com, brian.gix@intel.com, Inga Stotland Subject: [PATCH BlueZ v2 2/2] tools/mesh-cfgclient: Auto request own composition data Date: Thu, 16 Mar 2023 14:33:12 -0700 Message-Id: <20230316213312.159370-2-inga.stotland@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230316213312.159370-1-inga.stotland@gmail.com> References: <20230316213312.159370-1-inga.stotland@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org When attaching a local provisioner node, always request own composition data to accommodate functional consolidation of regular and remote provisioning mechanisms. The knowledge of the own node composition is necessary for provisioning initiation and self configuration. --- tools/mesh-cfgclient.c | 9 +++++++-- tools/mesh/cfgcli.c | 15 +++++++++++++++ tools/mesh/cfgcli.h | 2 ++ tools/mesh/util.c | 2 ++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/tools/mesh-cfgclient.c b/tools/mesh-cfgclient.c index 50be82bcf..6d2d34409 100644 --- a/tools/mesh-cfgclient.c +++ b/tools/mesh-cfgclient.c @@ -43,7 +43,8 @@ #define CFG_SRV_MODEL 0x0000 #define CFG_CLI_MODEL 0x0001 -#define RPR_SVR_MODEL 0xFFFF0004 +#define RPR_SVR_MODEL 0x0004 +#define RPR_CLI_MODEL 0x0005 #define PRV_BEACON_SVR 0x0008 #define PRV_BEACON_CLI 0x0009 @@ -775,6 +776,10 @@ static void attach_node_reply(struct l_dbus_proxy *proxy, remote_clear_rejected_addresses(ivi); } + /* Read own node composition */ + if (!cfgcli_get_comp(0x0001, 128)) + l_error("Failed to read own composition"); + return; fail: @@ -863,7 +868,7 @@ static void scan_start(void *user_data, uint16_t dst, uint32_t model) { struct scan_data *data; - if (model != RPR_SVR_MODEL) + if (model != (0xffff0000 | RPR_SVR_MODEL)) return; data = l_malloc(sizeof(struct scan_data)); diff --git a/tools/mesh/cfgcli.c b/tools/mesh/cfgcli.c index 4f6248e48..1a404af38 100644 --- a/tools/mesh/cfgcli.c +++ b/tools/mesh/cfgcli.c @@ -1081,6 +1081,21 @@ static void cmd_default(uint32_t opcode) return bt_shell_noninteractive_quit(EXIT_SUCCESS); } + +bool cfgcli_get_comp(uint16_t unicast, uint8_t page) +{ + uint16_t n; + uint8_t msg[32]; + + n = mesh_opcode_set(OP_DEV_COMP_GET, msg); + + msg[n++] = page; + + target = unicast; + + return config_send(msg, n, OP_DEV_COMP_GET); +} + static void cmd_composition_get(int argc, char *argv[]) { uint16_t n; diff --git a/tools/mesh/cfgcli.h b/tools/mesh/cfgcli.h index 7281caa46..621dd0259 100644 --- a/tools/mesh/cfgcli.h +++ b/tools/mesh/cfgcli.h @@ -19,4 +19,6 @@ typedef void (*delete_remote_func_t) (uint16_t primary, uint8_t ele_cnt); struct model_info *cfgcli_init(key_send_func_t key_func, delete_remote_func_t del_node, void *user_data); + +bool cfgcli_get_comp(uint16_t unicast, uint8_t page); void cfgcli_cleanup(void); diff --git a/tools/mesh/util.c b/tools/mesh/util.c index d8c47c0e9..dea496dbe 100644 --- a/tools/mesh/util.c +++ b/tools/mesh/util.c @@ -138,6 +138,8 @@ const char *sig_model_string(uint16_t sig_model_id) case 0x0001: return "Configuration Client"; case 0x0002: return "Health Server"; case 0x0003: return "Health Client"; + case 0x0004: return "Remote Provisioning Server"; + case 0x0005: return "Remote Provisioning Client"; case 0x0008: return "Private Beacon Server"; case 0x0009: return "Private Beacon Client"; case 0x1000: return "Generic OnOff Server";