From: "Michał Lowas-Rzechonek" <michal.lowas-rzechonek@silvair.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH BlueZ v6 5/5] mesh: Check that config server is present in primary element
Date: Fri, 26 Jul 2019 08:36:06 +0200 [thread overview]
Message-ID: <20190726063606.19359-6-michal.lowas-rzechonek@silvair.com> (raw)
In-Reply-To: <20190726063606.19359-1-michal.lowas-rzechonek@silvair.com>
This verifies that Config Server model is supported by element #0, and
is not supported by any other element.
---
mesh/node.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/mesh/node.c b/mesh/node.c
index 4d365156c..579e69892 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -899,6 +899,8 @@ uint16_t node_generate_comp(struct mesh_node *node, uint8_t *buf, uint16_t sz)
{
uint16_t n, features;
uint16_t num_ele = 0;
+ uint8_t *cfgmod_idx = NULL;
+
const struct l_queue_entry *ele_entry;
if (!node || !node->comp || sz < MIN_COMP_SIZE)
@@ -961,6 +963,9 @@ uint16_t node_generate_comp(struct mesh_node *node, uint8_t *buf, uint16_t sz)
mod_id = mesh_model_get_model_id(
(const struct mesh_model *) mod);
+ if (mod_id == CONFIG_SRV_MODEL)
+ cfgmod_idx = &ele->idx;
+
if ((mod_id & VENDOR_ID_MASK) == VENDOR_ID_MASK) {
if (n + 2 > sz)
goto element_done;
@@ -1006,6 +1011,9 @@ element_done:
if (!num_ele)
return 0;
+ if (!cfgmod_idx || *cfgmod_idx != PRIMARY_ELE_IDX)
+ return 0;
+
return n;
}
--
2.19.1
next prev parent reply other threads:[~2019-07-26 6:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-26 6:36 [PATCH BlueZ v6 0/5] Use composition data to validate app against the Michał Lowas-Rzechonek
2019-07-26 6:36 ` [PATCH BlueZ v6 1/5] mesh: Convert void pointers to anonymous unions in managed_obj_request Michał Lowas-Rzechonek
2019-07-26 6:36 ` [PATCH BlueZ v6 2/5] mesh: Validate application by comparing composition data Michał Lowas-Rzechonek
2019-07-26 6:36 ` [PATCH BlueZ v6 3/5] mesh: Keep element and model lists sorted and unique Michał Lowas-Rzechonek
2019-07-26 6:36 ` [PATCH BlueZ v6 4/5] mesh: Check that element indexes are consecutive Michał Lowas-Rzechonek
2019-07-26 6:36 ` Michał Lowas-Rzechonek [this message]
2019-07-26 14:24 ` [PATCH BlueZ v6 0/5] Use composition data to validate app against the Stotland, Inga
2019-07-26 16:19 ` Gix, Brian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190726063606.19359-6-michal.lowas-rzechonek@silvair.com \
--to=michal.lowas-rzechonek@silvair.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).