Merge pull request #18054 from FRRouting/mergify/bp/stable/10.2/pr-14105

pimd: Fix for FHR mroute taking longer to age out (backport #14105)
FRRouting · Feb 7, 2025 · 623f5f4 · 623f5f4
2 parents fc4e136 + 221fa07
commit 623f5f4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
@@ -233,10 +233,16 @@ void pim_ifchannel_delete_all(struct interface *ifp)
 
 void delete_on_noinfo(struct pim_ifchannel *ch)
 {
-	if (ch->local_ifmembership == PIM_IFMEMBERSHIP_NOINFO
-	    && ch->ifjoin_state == PIM_IFJOIN_NOINFO
-	    && ch->t_ifjoin_expiry_timer == NULL)
+	struct pim_upstream *up = ch->upstream;
+	/*
+	 * (S,G) with no active traffic, KAT expires, PPT expries,
+	 * channel state is NoInfo
+	 */
+	if (ch->local_ifmembership == PIM_IFMEMBERSHIP_NOINFO &&
+	    ch->ifjoin_state == PIM_IFJOIN_NOINFO &&
+	    (ch->t_ifjoin_expiry_timer == NULL || (up && !pim_upstream_is_kat_running(up)))) {
 		pim_ifchannel_delete(ch);
+	}
 }
 
 void pim_ifchannel_ifjoin_switch(const char *caller, struct pim_ifchannel *ch,

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
@@ -304,7 +304,7 @@ static void on_join_timer(struct event *t)
 	}
 
 	/*
-	 * In the case of a HFR we will not ahve anyone to send this to.
+	 * In the case of a FHR we will not ahve anyone to send this to.
 	 */
 	if (PIM_UPSTREAM_FLAG_TEST_FHR(up->flags))
 		return;
-Original file line number
+Diff line change
@@ Expand Up / @@ -304,7 +304,7 @@ static void on_join_timer(struct event *t) @@
     	}
     	/*
-    	 * In the case of a HFR we will not ahve anyone to send this to.
+    	 * In the case of a FHR we will not ahve anyone to send this to.
     	 */
     	if (PIM_UPSTREAM_FLAG_TEST_FHR(up->flags))
     		return;
@@ Expand Down @@