pimd: In Prune Pending state, the holdtime change is not taking effect

Problem Statement:
In Prune pending state, when Join is received, and there is hold timer change
the Expiry timer is not getting updated with new Hold timer.

Root Cause:
When thread_add_timer function is called and the thread is already in the list
the thread api just returns, it does not modify the timer value.
So when we want to change the timer, we need to first call THREAD_OFF and then
call thread_add_timer.
The Expiry timer thread is not cancelled in PIM_IFJOIN_PRUNE_PENDING state,
therefore the timer change is not taking effect.

Fix:
Call THREAD_OFF in that flow.

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>
(cherry picked from commit b206dc5566dc790174f2fd1d14687612a54c7acd)

diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index 3f985e64b4790d9d7e703f23f68a6a22c6ad0a37..86f897aed10b4bfa9f925ea2a202a246864b2237 100644 (file)
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -1021,6 +1021,7 @@ void pim_ifchannel_join_add(struct interface *ifp, struct in_addr neigh_addr,
                        if (remain > holdtime)
                                return;
                }
+               THREAD_OFF(ch->t_ifjoin_expiry_timer);
 
                break;
        case PIM_IFJOIN_PRUNE_TMP: