From 79ce47c00d216b1403a80f86ba7e10190532bbac Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 11 Aug 2016 07:07:15 -0400 Subject: [PATCH] pimd: Fix register stop timer 1) Ensure Timer is actually off 2) I missread the rfc, when we are in prune state, just send the register stop. Do not add the tunnel device yet. Signed-off-by: Donald Sharp --- pimd/pim_upstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 9ee0e87004..39f609da28 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -913,6 +913,7 @@ pim_upstream_register_stop_timer (struct thread *t) up = THREAD_ARG (t); + THREAD_TIMER_OFF (up->t_rs_timer); up->t_rs_timer = NULL; if (PIM_DEBUG_TRACE) @@ -940,7 +941,6 @@ pim_upstream_register_stop_timer (struct thread *t) ip_hdr.ip_len = htons (20); // checksum is broken pim_register_send ((uint8_t *)&ip_hdr, sizeof (struct ip), rpg, 1); - pim_channel_add_oif (up->channel_oil, pim_regiface, PIM_OIF_FLAG_PROTO_PIM); break; default: break; -- 2.39.5