Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp606323pxa; Tue, 4 Aug 2020 13:18:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyomDlHW6pmgBUofEo5htWulMqI3rM+3O5KCdVpSS2GDLskab0wBqJXiExDaYi/CF3tqE6y X-Received: by 2002:aa7:d304:: with SMTP id p4mr21189283edq.267.1596572316434; Tue, 04 Aug 2020 13:18:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596572316; cv=none; d=google.com; s=arc-20160816; b=S5mKKDJhnfc2z2tlWO7h4u4NXiz+cye0ArKOVnNHgHUh7sxCSwBlQMS5oBYWn+itGg YCP/ab+HphFJimjbLHmozvAWchh97Q/e2puVN/0PETEHaKmAVeddnckaUzZVJ8/thB/n JhIkgeHbQPwYrs+8MzMme2zEDWx1yGg7/NIxfWRP19MswLkjPZTLzPDBjAcvmLpm9K2K 1y5Hz/XRF2fnZfuwYfhUkR+AbF+fq6Irpql5GUr7aLUZrulofuWz0Vr+SYJALSeCZwP/ tRuaObLB0P6QJO1L8ZIda+Vez+mmvCXZ7HE0E+GSCOSYgZZ0Ioywxjw1rwZUX/uuqbHe 7uow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=qwQZMjSG3qPMW1YvdyMigVRtlOTKEUxlH6tzXt4wIzg=; b=n872TdawTOVqzYUaQzk/4NXkvd33oa9cM/3Yitshd1ByPxUYWkCGz8etLoqpbFsIAm Day51xD6cswr5VnH+jh9uGyyywu8yq+Hwm85LfpcSoouaVpi0PkO14SgpRYqnZtV+Loo QhThnw6uVvyKM5qqd21BprH7iYHZm7E+lj903MfKOMJYiZjti0Y5uwbzeKr2nxyNvQVG mjJ+gzQ6bncJIQ+QHyC/RdwT0Rm5lglC8mu/jU0/zyrDcpEMp89KFIZNpqaGC0hQU6qf ctf9XLjKg+m0qNlPaz2KCJfFvVGuu4EBfYnylxYCuu6KawncdQKtJRc5xVb/DnVpY1ZW 2q0g== 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 c64si12685743edf.114.2020.08.04.13.17.54; Tue, 04 Aug 2020 13:18:36 -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 S1726113AbgHDURt (ORCPT + 99 others); Tue, 4 Aug 2020 16:17:49 -0400 Received: from mga09.intel.com ([134.134.136.24]:64989 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726534AbgHDURs (ORCPT ); Tue, 4 Aug 2020 16:17:48 -0400 IronPort-SDR: QruiDq78fjaIlbxRNxYaTwQCzBEFD1B5jhfZUsy4OBco/beYh11cRtKYxH2EtDrm2GUkHgOGXf CbVbHPohtI8A== X-IronPort-AV: E=McAfee;i="6000,8403,9703"; a="153565377" X-IronPort-AV: E=Sophos;i="5.75,434,1589266800"; d="scan'208";a="153565377" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Aug 2020 13:17:46 -0700 IronPort-SDR: 1v5ZKe0Eu8t3XtIK+GMdk/vgSrNPNWRdnPc1RU3YR/lLJbXb4eVIVNMZom93iuRjqyZZ8JOz2K +pqeEpsg4mxw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,434,1589266800"; d="scan'208";a="324783831" Received: from unknown (HELO ingas-nuc1.intel.com) ([10.254.118.65]) by fmsmga002.fm.intel.com with ESMTP; 04 Aug 2020 13:17:46 -0700 From: Inga Stotland To: linux-bluetooth@vger.kernel.org Cc: brian.gix@intel.com, Inga Stotland Subject: [PATCH BlueZ v3 03/10] mesh: Clean up handling of config node identity message Date: Tue, 4 Aug 2020 13:17:37 -0700 Message-Id: <20200804201744.23327-3-inga.stotland@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200804201744.23327-1-inga.stotland@intel.com> References: <20200804201744.23327-1-inga.stotland@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This modification allows using a single point for sending out the composed status messages by the Config Server. --- mesh/cfgmod-server.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c index 35d0325a9..c501b0a52 100644 --- a/mesh/cfgmod-server.c +++ b/mesh/cfgmod-server.c @@ -777,11 +777,7 @@ static bool cfg_srv_pkt(uint16_t src, uint16_t dst, uint16_t app_idx, break; case OP_NODE_IDENTITY_SET: - if (size != 3 || pkt[2] > 0x01) - return true; - - n_idx = l_get_le16(pkt); - if (n_idx > 0xfff) + if (size != 3) return true; /* Currently setting node identity not supported */ @@ -789,18 +785,13 @@ static bool cfg_srv_pkt(uint16_t src, uint16_t dst, uint16_t app_idx, /* Fall Through */ case OP_NODE_IDENTITY_GET: - if (size < 2) + if (opcode == OP_NODE_IDENTITY_GET && size != 2) return true; n_idx = l_get_le16(pkt); - if (n_idx > 0xfff) - return true; n = mesh_model_opcode_set(OP_NODE_IDENTITY_STATUS, msg); - - status = mesh_net_get_identity_mode(net, n_idx, &state); - - msg[n++] = status; + msg[n++] = mesh_net_get_identity_mode(net, n_idx, &state); l_put_le16(n_idx, msg + n); n += 2; -- 2.26.2