2020-03-25 21:49:19

by Michał Lowas-Rzechonek

Subject: [PATCH BlueZ] mesh: Fix model publication status after set

This patch fixes usage of send_pub_status() when handling publication
set message - mod_id was swapped with pub_addr, resulting in malformed
message being sent back to the Config Client.
---
mesh/cfgmod-server.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c
index c5c756a33..856eb6b27 100644
--- a/mesh/cfgmod-server.c
+++ b/mesh/cfgmod-server.c
@@ -185,8 +185,8 @@ static void config_pub_set(struct mesh_node *node, uint16_t net_idx,
}

if (!unreliable)
- send_pub_status(node, net_idx, src, dst, status, ele_addr, ota,
- mod_id, idx, cred_flag, ttl, period, retransmit);
+ send_pub_status(node, net_idx, src, dst, status, ele_addr,
+ mod_id, ota, idx, cred_flag, ttl, period, retransmit);
}

static void send_sub_status(struct mesh_node *node, uint16_t net_idx,
--
2.25.0

2020-03-26 17:04:04

by Gix, Brian

Subject: Re: [PATCH BlueZ] mesh: Fix model publication status after set

Applied
On Wed, 2020-03-25 at 22:48 +0100, Michał Lowas-Rzechonek wrote:
> This patch fixes usage of send_pub_status() when handling publication
> set message - mod_id was swapped with pub_addr, resulting in malformed
> message being sent back to the Config Client.
> ---
> mesh/cfgmod-server.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c
> index c5c756a33..856eb6b27 100644
> --- a/mesh/cfgmod-server.c
> +++ b/mesh/cfgmod-server.c
> @@ -185,8 +185,8 @@ static void config_pub_set(struct mesh_node *node, uint16_t net_idx,
> }
>
> if (!unreliable)
> - send_pub_status(node, net_idx, src, dst, status, ele_addr, ota,
> - mod_id, idx, cred_flag, ttl, period, retransmit);
> + send_pub_status(node, net_idx, src, dst, status, ele_addr,
> + mod_id, ota, idx, cred_flag, ttl, period, retransmit);
> }
>
> static void send_sub_status(struct mesh_node *node, uint16_t net_idx,