[BlueZ] mesh: Send correct NetKey index in DevKeyMessageReceived

Commit Message

Stotland, Inga Aug. 19, 2020, 9:48 p.m. UTC

The value of net_index in DevKeyMessageReceived() method must be set
to the value of a subnet index on which a device key encoded message
has been received. Was hard coded to 0. Fixed.
---
 mesh/model.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Brian Gix Aug. 20, 2020, 2:29 p.m. UTC | #1

Applied
On Wed, 2020-08-19 at 14:48 -0700, Inga Stotland wrote:
> The value of net_index in DevKeyMessageReceived() method must be set
> to the value of a subnet index on which a device key encoded message
> has been received. Was hard coded to 0. Fixed.
> ---
>  mesh/model.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/mesh/model.c b/mesh/model.c
> index b44e2f669..9529dfb2e 100644
> --- a/mesh/model.c
> +++ b/mesh/model.c
> @@ -965,7 +965,8 @@ bool mesh_model_rx(struct mesh_node *node, bool szmict, uint32_t seq0,
>  			else if (decrypt_idx == APP_IDX_DEV_REMOTE ||
>  				 decrypt_idx == APP_IDX_DEV_LOCAL)
>  				send_dev_key_msg_rcvd(node, i, src, decrypt_idx,
> -						0, forward.size, forward.data);
> +							net_idx, forward.size,
> +								forward.data);
>  		}
>  
>  		/*

Patch

diff --git a/mesh/model.c b/mesh/model.c
index b44e2f669..9529dfb2e 100644
--- a/mesh/model.c
+++ b/mesh/model.c
@@ -965,7 +965,8 @@  bool mesh_model_rx(struct mesh_node *node, bool szmict, uint32_t seq0,
 			else if (decrypt_idx == APP_IDX_DEV_REMOTE ||
 				 decrypt_idx == APP_IDX_DEV_LOCAL)
 				send_dev_key_msg_rcvd(node, i, src, decrypt_idx,
-						0, forward.size, forward.data);
+							net_idx, forward.size,
+								forward.data);
 		}
 
 		/*