From 00d2f9e45b953f0f710cc0a14cc9dac5205acedc Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 17 Aug 2016 20:44:51 -0400 Subject: [PATCH] pimd: Fix RP handling of Register message The RP needs to send the join when we want to send it Also make sure the ka_timer is reset properly. Ticket: CM-12473 Signed-off-by: Donald Sharp --- pimd/pim_upstream.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index da1a1c7666..8d908b719e 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -191,8 +191,6 @@ pim_upstream_send_join (struct pim_upstream *up) if (up->fhr) return; - zassert(up->join_state == PIM_UPSTREAM_JOINED); - /* send Join(S,G) to the current upstream neighbor */ pim_joinprune_send(up->rpf.source_nexthop.interface, up->rpf.rpf_addr, @@ -854,6 +852,7 @@ void pim_upstream_keep_alive_timer_start (struct pim_upstream *up, uint32_t time) { + THREAD_OFF (up->t_ka_timer); THREAD_TIMER_ON (master, up->t_ka_timer, pim_upstream_keep_alive_timer, -- 2.39.5