[BlueZ] mesh: Don't add config server when loading from storage

Commit Message

Stotland, Inga Aug. 13, 2020, 5:01 a.m. UTC

Adding a sonfig server model when loading from storage is unnecessary,
since the daemon-generated stored configuration always contains
config server model.
This also fixes a memory leak caused by bad parameters passed to
mesh_model_add()
---
 mesh/node.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Brian Gix Aug. 13, 2020, 10:07 p.m. UTC | #1

Applied
On Wed, 2020-08-12 at 22:01 -0700, Inga Stotland wrote:
> Adding a sonfig server model when loading from storage is unnecessary,
> since the daemon-generated stored configuration always contains
> config server model.
> This also fixes a memory leak caused by bad parameters passed to
> mesh_model_add()
> ---
>  mesh/node.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/mesh/node.c b/mesh/node.c
> index 4b70587ae..1eeffeb8b 100644
> --- a/mesh/node.c
> +++ b/mesh/node.c
> @@ -353,9 +353,6 @@ static bool add_elements_from_storage(struct mesh_node *node,
>  		if (!add_element_from_storage(node, entry->data))
>  			return false;
>  
> -	/* Add configuration server model on the primary element */
> -	mesh_model_add(node, PRIMARY_ELE_IDX, CONFIG_SRV_MODEL, NULL);
> -
>  	return true;
>  }
>

Patch

diff --git a/mesh/node.c b/mesh/node.c
index 4b70587ae..1eeffeb8b 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -353,9 +353,6 @@  static bool add_elements_from_storage(struct mesh_node *node,
 		if (!add_element_from_storage(node, entry->data))
 			return false;
 
-	/* Add configuration server model on the primary element */
-	mesh_model_add(node, PRIMARY_ELE_IDX, CONFIG_SRV_MODEL, NULL);
-
 	return true;
 }