From 00852d31df223537b8ce2b8fc9a714a10d31c9f5 Mon Sep 17 00:00:00 2001 From: Inga Stotland Date: Wed, 18 Nov 2020 11:56:00 -0800 Subject: [PATCH] mesh: Fix regression error in HB subscription set This fixes a regression introduced in commit c77bb848a9fb ("mesh: Refactor heartbeat pub/sub"): Heartbeat subscription should be enabled unless either source or destination are unassigned addresses or period log is zero. Also, decrement ref count on group destination address if period log is zero since the subscription is not supposed to be processed. --- mesh/net.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mesh/net.c b/mesh/net.c index 9e0ea860f..b24cdba77 100644 --- a/mesh/net.c +++ b/mesh/net.c @@ -3582,16 +3582,21 @@ int mesh_net_set_heartbeat_sub(struct mesh_net *net, uint16_t src, uint16_t dst, sub->max_hops = 0; } else if (!period_log && src == sub->src && dst == sub->dst) { + if (IS_GROUP(sub->dst)) + mesh_net_dst_unreg(net, sub->dst); + /* Preserve collected data, but disable */ sub->enabled = false; sub->period = 0; - } else if (sub->dst != dst) { - if (IS_GROUP(sub->dst)) - mesh_net_dst_unreg(net, sub->dst); + } else { + if (sub->dst != dst) { + if (IS_GROUP(sub->dst)) + mesh_net_dst_unreg(net, sub->dst); - if (IS_GROUP(dst)) - mesh_net_dst_reg(net, dst); + if (IS_GROUP(dst)) + mesh_net_dst_reg(net, dst); + } sub->enabled = !!period_log; sub->src = src; -- 2.47.3