2019-07-02 12:32:34

by Jakub Witowski

Subject: [PATCH BlueZ v2] mesh: Allow to set-up the CRPL with application

This adds an optional CRPL property to org.bluez.mesh.Application1
interface, allowing to indicate the depth of reply protection list.
---
doc/mesh-api.txt | 4 ++++
mesh/node.c | 18 +++++++++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/doc/mesh-api.txt b/doc/mesh-api.txt
index 4e0a8bff1..893a1a6c0 100644
--- a/doc/mesh-api.txt
+++ b/doc/mesh-api.txt
@@ -724,6 +724,10 @@ Properties:

A 16-bit vendor-assigned product version identifier

+ uint16 CRPL [read-only, optional]
+
+ A 16-bit minimum number of replay protection list entries
+

Mesh Element Hierarchy
======================
diff --git a/mesh/node.c b/mesh/node.c
index 7383793d9..adc2aa93e 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -1312,10 +1312,6 @@ static bool create_node_config(struct mesh_node *node)
static void set_defaults(struct mesh_node *node)
{
/* TODO: these values should come from mesh.conf */
- if (!node->comp)
- node->comp = l_new(struct node_composition, 1);
-
- node->comp->crpl = DEFAULT_CRPL;
node->lpn = MESH_MODE_UNSUPPORTED;
node->proxy = MESH_MODE_UNSUPPORTED;
node->friend = MESH_MODE_UNSUPPORTED;
@@ -1338,8 +1334,10 @@ static bool get_app_properties(struct mesh_node *node, const char *path,

l_debug("path %s", path);

- if (is_new)
+ if (is_new) {
node->comp = l_new(struct node_composition, 1);
+ node->comp->crpl = DEFAULT_CRPL;
+ }

while (l_dbus_message_iter_next_entry(properties, &key, &variant)) {

@@ -1372,6 +1370,16 @@ static bool get_app_properties(struct mesh_node *node, const char *path,
return false;

node->comp->vid = value;
+
+ } else if (!strcmp(key, "CRPL")) {
+ if (!l_dbus_message_iter_get_variant(&variant, "q",
+ &value))
+ return false;
+
+ if (!is_new && node->comp->crpl != value)
+ return false;
+
+ node->comp->crpl = value;
}
}

--
2.20.1

2019-07-02 17:50:45

by Gix, Brian

Subject: Re: [PATCH BlueZ v2] mesh: Allow to set-up the CRPL with application

Patch Applied

On Tue, 2019-07-02 at 14:31 +0200, Jakub Witowski wrote:
> This adds an optional CRPL property to org.bluez.mesh.Application1
> interface, allowing to indicate the depth of reply protection list.
> ---
> doc/mesh-api.txt | 4 ++++
> mesh/node.c | 18 +++++++++++++-----
> 2 files changed, 17 insertions(+), 5 deletions(-)
>
> diff --git a/doc/mesh-api.txt b/doc/mesh-api.txt
> index 4e0a8bff1..893a1a6c0 100644
> --- a/doc/mesh-api.txt
> +++ b/doc/mesh-api.txt
> @@ -724,6 +724,10 @@ Properties:
>
> A 16-bit vendor-assigned product version identifier
>
> + uint16 CRPL [read-only, optional]
> +
> + A 16-bit minimum number of replay protection list entries
> +
>
> Mesh Element Hierarchy
> ======================
> diff --git a/mesh/node.c b/mesh/node.c
> index 7383793d9..adc2aa93e 100644
> --- a/mesh/node.c
> +++ b/mesh/node.c
> @@ -1312,10 +1312,6 @@ static bool create_node_config(struct mesh_node *node)
> static void set_defaults(struct mesh_node *node)
> {
> /* TODO: these values should come from mesh.conf */
> - if (!node->comp)
> - node->comp = l_new(struct node_composition, 1);
> -
> - node->comp->crpl = DEFAULT_CRPL;
> node->lpn = MESH_MODE_UNSUPPORTED;
> node->proxy = MESH_MODE_UNSUPPORTED;
> node->friend = MESH_MODE_UNSUPPORTED;
> @@ -1338,8 +1334,10 @@ static bool get_app_properties(struct mesh_node *node, const char *path,
>
> l_debug("path %s", path);
>
> - if (is_new)
> + if (is_new) {
> node->comp = l_new(struct node_composition, 1);
> + node->comp->crpl = DEFAULT_CRPL;
> + }
>
> while (l_dbus_message_iter_next_entry(properties, &key, &variant)) {
>
> @@ -1372,6 +1370,16 @@ static bool get_app_properties(struct mesh_node *node, const char *path,
> return false;
>
> node->comp->vid = value;
> +
> + } else if (!strcmp(key, "CRPL")) {
> + if (!l_dbus_message_iter_get_variant(&variant, "q",
> + &value))
> + return false;
> +
> + if (!is_new && node->comp->crpl != value)
> + return false;
> +
> + node->comp->crpl = value;
> }
> }
>