Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp208590pxb; Wed, 22 Sep 2021 20:29:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLvdblOtKTLX+RwpeECH2eJnTJjKPIDwaaObr8WigjKIq28FW8eU5uJ1XwKj428IXlQl6L X-Received: by 2002:a05:6402:2050:: with SMTP id bc16mr2969366edb.270.1632367759808; Wed, 22 Sep 2021 20:29:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632367759; cv=none; d=google.com; s=arc-20160816; b=cxBxkDmhs8y6sBb1bSsxOsH6mMTYzNRj5YCCn5avWu9i79+WIqDKXcV/G2BSZ+IfVS 3UKZIkC2oOMZUoLDFu2nps3YhZMP7EN+0V8a8I3IzCXFWnB/tlhIlxW9SwX1zBDSsTzE dDqyTYtcVPxSv+YxSyeNaH74v3XPTucngcSTDTnf2BBFKTrSCsQ6KUEeJ8Z8ba4IqZ/2 YoEq61R+DqtNvgmEIHikmUVixRjRfeMY9jk2cRHD/HPx8Rq994t87BH+bsYFJ3YX3rYJ 894SIOXe6LYZpZGiJRcBy2FdrO0IITspU+JinmKXZ8eQk/feMwNU/SzDrTbzcYt3euO8 n+PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=HzFalJO7gzdnnel9uSAnudcz79l4JHSx+OkGKcjrvMU=; b=cvPEH/kSc5zuWTFjr2lcI33msrPZu3JEhgVYIj8eUeBStAG1D0MipBLNwOMmgTah7e Hwk7YwN2owf5aDNG/I24SEC5w48ca8+AHIWCo/ZhjPM1EhB+6bdoKC6+auQe5/tM6uVM Oeu+2On8fUi4+y8ahMV+qZUhsqn55Q52l3OdgTLlhOpCvY551x1YpLNgRvKKTPX53oWj /eGamnR3y5c8edFHkxqfIupwqRDXI45HTXWKd5T3wg7wQHUciEi5ZjuGVv/+aChbvTX3 tFVPHmHOiEFdLEe2tuu8zD0vK5dT42MdTPhMXvbhuwKjOjuWzhFmyXkeqc0stK1ZN5AZ c+uA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s7si4623424ejs.402.2021.09.22.20.28.40; Wed, 22 Sep 2021 20:29:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239052AbhIWD2n (ORCPT + 99 others); Wed, 22 Sep 2021 23:28:43 -0400 Received: from mga11.intel.com ([192.55.52.93]:16373 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239042AbhIWD2l (ORCPT ); Wed, 22 Sep 2021 23:28:41 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10115"; a="220555898" X-IronPort-AV: E=Sophos;i="5.85,315,1624345200"; d="scan'208";a="220555898" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2021 20:26:53 -0700 X-IronPort-AV: E=Sophos;i="5.85,315,1624345200"; d="scan'208";a="534072335" Received: from jdudwadk-mobl.amr.corp.intel.com (HELO istotlan-desk.intel.com) ([10.212.205.211]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Sep 2021 20:26:52 -0700 From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@intel.com, Inga Stotland Subject: [PATCH BlueZ 03/20] tools/mesh-cfgclient: Update stored NetKey and AppKey Date: Wed, 22 Sep 2021 20:25:46 -0700 Message-Id: <20210923032603.50536-4-inga.stotland@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210923032603.50536-1-inga.stotland@intel.com> References: <20210923032603.50536-1-inga.stotland@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org NetKeys: - Record additional properties: "name", "minSecurity", "timestamp" AppKeys: - Record additional property: "name" --- tools/mesh/mesh-db.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/mesh/mesh-db.c b/tools/mesh/mesh-db.c index d42587da8..5b3c4b2f7 100644 --- a/tools/mesh/mesh-db.c +++ b/tools/mesh/mesh-db.c @@ -517,6 +517,7 @@ static void load_remotes(json_object *jcfg) static bool add_app_key(json_object *jobj, uint16_t net_idx, uint16_t app_idx) { json_object *jkey, *jarray; + char buf[12]; json_object_object_get_ex(jobj, "appKeys", &jarray); if (!jarray || json_object_get_type(jarray) != json_type_array) @@ -524,6 +525,11 @@ static bool add_app_key(json_object *jobj, uint16_t net_idx, uint16_t app_idx) jkey = json_object_new_object(); + snprintf(buf, 12, "AppKey %4.4x", app_idx); + + if (!add_string(jkey, "name", buf)) + goto fail; + if (!write_int(jkey, "boundNetKey", (int)net_idx)) goto fail; @@ -721,6 +727,7 @@ static bool load_keys(json_object *jobj) bool mesh_db_net_key_add(uint16_t net_idx) { json_object *jkey, *jarray; + char buf[12]; if (!cfg || !cfg->jcfg) return false; @@ -734,12 +741,20 @@ bool mesh_db_net_key_add(uint16_t net_idx) jkey = json_object_new_object(); + snprintf(buf, 12, "Subnet %4.4x", net_idx); + + if (!add_string(jkey, "name", buf)) + goto fail; + if (!write_int(jkey, "index", net_idx)) goto fail; if (!write_int(jkey, "phase", KEY_REFRESH_PHASE_NONE)) goto fail; + if (!add_string(jkey, "minSecurity", "secure")) + goto fail; + if (!set_timestamp(jkey)) goto fail; -- 2.31.1